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

Accepting request 647321 from system:install:head

Browse Source 
- Simplify code:
  * Remove remaining support for non-UTF-8
  * Don't set the X11 keymap, localectl does that already with the
    same mapping table
  * Remove YAST_KEYBOARD, not used

OBS-URL: https://build.opensuse.org/request/show/647321
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/live-langset-data?expand=0&rev=11
This commit is contained in:
Dominique Leuenberger 2018-11-09 06:55:24 +00:00 committed by Git OBS Bridge
commit 2547c560f3
3 changed files with 11 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
getcountrydata.rb
View File

@ -33,9 +33,6 @@ module Yast
kbd = Keyboard.GetKeyboardForLanguage(lang, "us") kbd = Keyboard.GetKeyboardForLanguage(lang, "us")
# does not really set keyboard, only fills some data # does not really set keyboard, only fills some data
Keyboard.SetKeyboard(kbd) Keyboard.SetKeyboard(kbd)
# set language for encoding
WFM.SetLanguage(fqlanguage)
yast_kbd = "#{kbd},#{Keyboard.kb_model}"
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]]
@ -60,16 +57,9 @@ module Yast
"CONSOLE_UNICODEMAP='#{unicodeMap}'\n" + "CONSOLE_UNICODEMAP='#{unicodeMap}'\n" +
"CONSOLE_MAGIC='#{magic}'\n" + "CONSOLE_MAGIC='#{magic}'\n" +
"KEYTABLE='#{Keyboard.keymap}'\n" + "KEYTABLE='#{Keyboard.keymap}'\n" +
"YAST_KEYBOARD='#{yast_kbd}'\n" + "TIMEZONE='#{timezone}'\n"
"TIMEZONE='#{timezone}'\n" +
"CONSOLE_ENCODING='#{WFM.GetEncoding}'"
contents << "\nRC_LC_MESSAGES='zh_TW.UTF-8'" if lang == "zh_HK" contents << "RC_LC_MESSAGES='zh_TW.UTF-8'\n" if lang == "zh_HK"
x11data = Keyboard.GetX11KeyData(Keyboard.keymap)
Builtins.foreach(x11data) do |key, val|
contents << "\n#{key}='#{val}'"
end
contents << "\n"
SCR.Write(path(".target.string"), dir + "/" + fqlanguage, contents) SCR.Write(path(".target.string"), dir + "/" + fqlanguage, contents)
end end
end end

4
langset.sh
View File

@ -74,10 +74,6 @@ set_sysconfig_option() {
[ -n "$TIMEZONE" ] && [ -f "/usr/share/zoneinfo/$TIMEZONE" ] && rm -f /etc/localtime && ln -s /usr/share/zoneinfo/$TIMEZONE /etc/localtime [ -n "$TIMEZONE" ] && [ -f "/usr/share/zoneinfo/$TIMEZONE" ] && rm -f /etc/localtime && ln -s /usr/share/zoneinfo/$TIMEZONE /etc/localtime
if [ -n "$XkbLayout" ] && [ -n "$XkbModel" ] && [ -n "$XkbVariant" ] && [ -n "$XkbOptions" ]; then
localectl set-x11-keymap "$XkbLayout" "$XkbModel" "$XkbVariant" "$XkbOptions"
fi
# Override with the cmdline provided one, if possible # Override with the cmdline provided one, if possible
[ -z "$keytable" ] || localectl set-keymap $keytable [ -z "$keytable" ] || localectl set-keymap $keytable

9
live-langset-data.changes
View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
Thu Nov 8 12:48:15 UTC 2018 - Fabian Vogt <fvogt@suse.com>
- Simplify code:
* Remove remaining support for non-UTF-8
* Don't set the X11 keymap, localectl does that already with the
same mapping table
* Remove YAST_KEYBOARD, not used
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Nov 6 15:23:41 UTC 2018 - Fabian Vogt <fvogt@suse.com> Tue Nov 6 15:23:41 UTC 2018 - Fabian Vogt <fvogt@suse.com>