Merge pull request #496 from mchf/default_language

Set default language before proposing
yast · Jan 24, 2017 · b418549 · b418549
2 parents b9241ed + 7c57ca5
commit b418549
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 1 deletion.
diff --git a/package/yast2-installation.changes b/package/yast2-installation.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Fri Jan 20 08:44:28 UTC 2017 - mfilka@suse.com
+
+- bnc#1017752
+  - do not show language change warning in software proposal
+    incorrectly when language was not changed.
+- 3.1.217.12 
+
 -------------------------------------------------------------------
 Tue Jan 17 15:34:22 UTC 2017 - igonzalezsosa@suse.com
 

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

diff --git a/src/lib/installation/proposal_runner.rb b/src/lib/installation/proposal_runner.rb
@@ -102,6 +102,12 @@ def run
 
       return :auto if !submod_descriptions_and_build_menu
 
+      # Default language is the most often set by language proposal later in the workflow
+      # and overwrites this.
+      # However, some products do not contain such proposal (e.g. CaaSP) and needs this
+      # setup to avoid false language change detection (e.g. in software proposal)
+      Yast::Pkg.SetPackageLocale(Yast::Language.language)
+
       #
       # Make the initial proposal
       #