From e288758985bb1c363f996f40f40a66f638f06d4e55539de91336b623c140fc05 Mon Sep 17 00:00:00 2001 From: Fabian Vogt Date: Wed, 31 Jan 2018 09:50:28 +0000 Subject: [PATCH] - Update getcountrydata.rb to work with 2-letter language codes as used by the openSUSE consolefonts.ycp OBS-URL: https://build.opensuse.org/package/show/system:install:head/live-langset-data?expand=0&rev=11 --- getcountrydata.rb | 6 +++++- live-langset-data.changes | 6 ++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/getcountrydata.rb b/getcountrydata.rb index b23fea0..ee630fa 100644 --- a/getcountrydata.rb +++ b/getcountrydata.rb @@ -26,7 +26,11 @@ module Yast # 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 + consolefont = consolefonts[lang[0,2]] + end + consolefont ||= [] font = consolefont[0] || "" unicodeMap = consolefont[1] || "" screenMap = consolefont[2] || "" diff --git a/live-langset-data.changes b/live-langset-data.changes index 738cec6..d6b20e6 100644 --- a/live-langset-data.changes +++ b/live-langset-data.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Jan 31 09:49:14 UTC 2018 - fvogt@suse.com + +- Update getcountrydata.rb to work with 2-letter language codes + as used by the openSUSE consolefonts.ycp + ------------------------------------------------------------------- Wed Jan 24 07:56:03 UTC 2018 - fvogt@suse.com