Merge 41ab8bd into e7e11c8

yast · Jul 7, 2020 · 28a3668 · 28a3668
2 parents e7e11c8 + 41ab8bd
commit 28a3668
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 3 deletions.
diff --git a/library/desktop/src/modules/Desktop.rb b/library/desktop/src/modules/Desktop.rb
@@ -32,7 +32,6 @@
 module Yast
   class DesktopClass < Module
     def main
-      Yast.import "UI"
       textdomain "base"
       Yast.import "Map"
       Yast.import "Directory"
@@ -105,7 +104,12 @@ def ReadLocalizedKey(fname, keypath, key)
     def ReadLanguage
       # read language
       @LanguageFull = ""
-      @Language = UI.GetLanguage(true)
+      @Language = ""
+
+      # Do not use UI.GetLanguage. It would start an UI which is not
+      # needed for it.
+      @Language = ENV["LANG"].split(/[\.,@]/).first if ENV["LANG"]
+
       if Builtins.regexpmatch(@Language, "(.*_[^.]*)\\.?.*") # matches: ll_TT ll_TT.UTF-8
         @LanguageFull = Builtins.regexpsub(@Language, "(.*_[^.]*)\\.?.*", "\\1")
       end

diff --git a/package/yast2.changes b/package/yast2.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue Jul  7 09:48:04 CEST 2020 - schubi@suse.de
+
+- Command line interface: Do not start an UI while evaluating
+  current language settings (bsc#1173133).
+- 4.1.79
+
 -------------------------------------------------------------------
 Fri Jun  5 15:13:42 UTC 2020 - José Iván López González <jlopez@suse.com>
 

diff --git a/package/yast2.spec b/package/yast2.spec
@@ -17,7 +17,7 @@
 
 
 Name:           yast2
-Version:        4.1.78
+Version:        4.1.79
 
 Release:        0
 Summary:        YaST2 - Main Package