Merge 7256756 into 79d633b

yast · Nov 16, 2018 · 9b4aa63 · 9b4aa63
2 parents 79d633b + 7256756
commit 9b4aa63
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 5 deletions.
diff --git a/package/autoyast2.changes b/package/autoyast2.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Thu Nov 15 15:11:47 UTC 2018 - igonzalezsosa@suse.com
+
+- Fallback to English when using fbiterm on those languages
+  which are not properly supported (fate#325746).
+- 4.0.68
+
 -------------------------------------------------------------------
 Tue Nov 13 11:53:55 CET 2018 - schubi@suse.de
 

diff --git a/package/autoyast2.spec b/package/autoyast2.spec
@@ -22,7 +22,7 @@
 %endif
 
 Name:           autoyast2
-Version:        4.0.67
+Version:        4.0.68
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build

diff --git a/src/clients/inst_autosetup.rb b/src/clients/inst_autosetup.rb
@@ -232,8 +232,10 @@ def main
         Installation.encoding = "UTF-8"
       end
 
-      UI.SetLanguage(Language.language, Installation.encoding)
-      WFM.SetLanguage(Language.language, "UTF-8")
+      unless Language.SwitchToEnglishIfNeeded(true)
+        UI.SetLanguage(Language.language, Installation.encoding)
+        WFM.SetLanguage(Language.language, "UTF-8")
+      end
 
       if Builtins.haskey(Profile.current, "timezone")
         Timezone.Import(Ops.get_map(Profile.current, "timezone", {}))

diff --git a/src/clients/inst_autosetup_upgrade.rb b/src/clients/inst_autosetup_upgrade.rb
@@ -164,8 +164,10 @@ def main
         Installation.encoding = "UTF-8"
       end
 
-      UI.SetLanguage(Language.language, Installation.encoding)
-      WFM.SetLanguage(Language.language, "UTF-8")
+      unless Language.SwitchToEnglishIfNeeded(true)
+        UI.SetLanguage(Language.language, Installation.encoding)
+        WFM.SetLanguage(Language.language, "UTF-8")
+      end
 
       if Builtins.haskey(Profile.current, "timezone")
         Timezone.Import(Ops.get_map(Profile.current, "timezone", {}))