pool/live-langset-data
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- Rely on localectl's mapping for new yast2-country

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/system:install:head/live-langset-data?expand=0&rev=25
This commit is contained in:
Fabian Vogt 2019-10-30 08:22:40 +00:00 committed by Git OBS Bridge
parent f744f0b192
commit 2aa56fb16d
2 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
getcountrydata.rb
View File

@ -30,9 +30,15 @@ module Yast
Builtins.foreach(langs) do |lang, ll| Builtins.foreach(langs) do |lang, ll|
suffix = ll[2] || "" suffix = ll[2] || ""
fqlanguage = lang + suffix fqlanguage = lang + suffix
kbd = Keyboard.GetKeyboardForLanguage(lang, "us") if Keyboard.methods.include? :Codes
# does not really set keyboard, only fills some data # With new YaST, the keymap isn't available anymore, rely on localectl's mapping
Keyboard.SetKeyboard(kbd) keymap = ""
else
kbd = Keyboard.GetKeyboardForLanguage(lang, "us")
# does not really set keyboard, only fills some data
Keyboard.SetKeyboard(kbd)
keymap = Keyboard.keymap
end
consolefont = consolefonts[fqlanguage] || consolefonts[lang] consolefont = consolefonts[fqlanguage] || consolefonts[lang]
if consolefont.nil? && lang.size > 2 if consolefont.nil? && lang.size > 2
consolefont = consolefonts[lang[0,2]] consolefont = consolefonts[lang[0,2]]
@ -56,7 +62,7 @@ module Yast
"CONSOLE_SCREENMAP='#{screenMap}'\n" + "CONSOLE_SCREENMAP='#{screenMap}'\n" +
"CONSOLE_UNICODEMAP='#{unicodeMap}'\n" + "CONSOLE_UNICODEMAP='#{unicodeMap}'\n" +
"CONSOLE_MAGIC='#{magic}'\n" + "CONSOLE_MAGIC='#{magic}'\n" +
"KEYTABLE='#{Keyboard.keymap}'\n" + "KEYTABLE='#{keymap}'\n" +
"TIMEZONE='#{timezone}'\n" "TIMEZONE='#{timezone}'\n"
contents << "RC_LC_MESSAGES='zh_TW.UTF-8'\n" if lang == "zh_HK" contents << "RC_LC_MESSAGES='zh_TW.UTF-8'\n" if lang == "zh_HK"

5
live-langset-data.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Fri Jan 18 09:19:37 UTC 2019 - Fabian Vogt <fvogt@suse.com>
- Rely on localectl's mapping for new yast2-country
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Jan 7 16:19:54 UTC 2019 - Fabian Vogt <fvogt@suse.com> Mon Jan 7 16:19:54 UTC 2019 - Fabian Vogt <fvogt@suse.com>