From ac55dea6ae6cb38633631b18c74c76f452763cfd Mon Sep 17 00:00:00 2001
From: Martin Whitaker <mageia@martin-whitaker.me.uk>
Date: Thu, 18 Apr 2019 21:18:30 +0100
Subject: installer: preserve existing locale settings on upgrade (mga#24671)

---
 perl-install/install/NEWS     | 1 +
 perl-install/install/steps.pm | 8 +++++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index c7151e368..657bf0ab7 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,3 +1,4 @@
+- preserve existing locale settings on upgrade (mga#24671)
 - store country code in /etc/locale.conf (mga#24671)
 - don't automatically change time zone on upgrade (mga#24670)
 - partitioning: fix resize of encrypted partitions (mga#22032)
diff --git a/perl-install/install/steps.pm b/perl-install/install/steps.pm
index 5dd31bf62..285feb8a9 100644
--- a/perl-install/install/steps.pm
+++ b/perl-install/install/steps.pm
@@ -126,7 +126,13 @@ sub selectLanguage {
     $o->charsetChanged;
 
     addToBeDone {
-	lang::write_langs($o->{locale}{langs});
+        if ($o->{isUpgrade}) {
+            #- preserve existing locale settings (mga#24671)
+            $o->{locale} = lang::read();
+            $o->{locale}{langs}{$o->{locale}{lang}} = 1;
+        } else {
+            lang::write_langs($o->{locale}{langs});
+        }
     } 'formatPartitions';
     addToBeDone {
 	lang::write_and_install($o->{locale}, $o->do_pkgs);
-- 
cgit v1.2.1