Skip to content

Commit

Permalink
Merge 9a50e0c into 974d620
Browse files Browse the repository at this point in the history
  • Loading branch information
schubi2 committed Jul 7, 2020
2 parents 974d620 + 9a50e0c commit c966548
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 3 deletions.
8 changes: 6 additions & 2 deletions library/desktop/src/modules/Desktop.rb
Expand Up @@ -30,7 +30,6 @@
module Yast
class DesktopClass < Module
def main
Yast.import "UI"
textdomain "base"
Yast.import "Arch"
Yast.import "Map"
Expand Down Expand Up @@ -102,7 +101,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"]

@LanguageFull = Builtins.regexpsub(@Language, "(.*_[^.]*)\\.?.*", "\\1") if Builtins.regexpmatch(@Language, "(.*_[^.]*)\\.?.*") # matches: ll_TT ll_TT.UTF-8
@Language = Builtins.regexpsub(@Language, "(.*)_", "\\1") if Builtins.regexpmatch(@Language, "(.*)_")
Builtins.y2debug("LanguageFull=%1", @LanguageFull)
Expand Down
7 changes: 7 additions & 0 deletions 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.3.13

-------------------------------------------------------------------
Mon Jun 29 15:26:44 UTC 2020 - schubi@suse.de
- Products: Do not solve dependencies while checking libzypp
Expand Down
2 changes: 1 addition & 1 deletion package/yast2.spec
Expand Up @@ -17,7 +17,7 @@


Name: yast2
Version: 4.3.12
Version: 4.3.13
Release: 0
Summary: YaST2 Main Package
License: GPL-2.0-only
Expand Down

0 comments on commit c966548

Please sign in to comment.