Merge pull request #169 from jsrain/SLE-15-GA

handle setting locale in firstboot (bsc#1092979)
yast · May 14, 2018 · 73d265d · 73d265d
2 parents 50d8f2a + e000435
commit 73d265d
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 1 deletion.
diff --git a/language/src/modules/Language.rb b/language/src/modules/Language.rb
@@ -918,6 +918,8 @@ def Selection
     def Save
       loc = GetLocaleString(@language)
 
+      @localed_conf = {} if @localed_conf.nil?
+
       if Builtins.find(loc, "zh_HK") == 0
         @localed_conf["LC_MESSAGES"] = "zh_TW"
       elsif @localed_conf["LC_MESSAGES"] == "zh_TW"

diff --git a/package/yast2-country.changes b/package/yast2-country.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon May 14 10:26:11 UTC 2018 - jsrain@suse.cz
+
+- handle setting locale in firstboot (bsc#1092979)
+- 4.0.21
+
 -------------------------------------------------------------------
 Fri Feb  9 16:41:49 UTC 2018 - ancor@suse.com
 

diff --git a/package/yast2-country.spec b/package/yast2-country.spec
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-country
-Version:        4.0.20
+Version:        4.0.21
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build