From d5e3cd67e88ac43bb399efce66a98f3ba9c32740 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ji=C5=99=C3=AD=20Suchomel?= Date: Wed, 15 May 2013 09:04:20 +0200 Subject: [PATCH] - do not use non-UTF encoding fallback when nothing is configured (bnc#815265) - 2.17.54 --- VERSION | 2 +- language/src/modules/Language.ycp | 5 ++++- package/yast2-country.changes | 7 +++++++ 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/VERSION b/VERSION index 07ece89b..2895858c 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.17.53 +2.17.54 diff --git a/language/src/modules/Language.ycp b/language/src/modules/Language.ycp index cffb5832..a86d7912 100644 --- a/language/src/modules/Language.ycp +++ b/language/src/modules/Language.ycp @@ -504,7 +504,10 @@ global define void ReadSysconfigValues () { if (!Stage::initial () || Mode::live_installation ()) { string val = toupper (Misc::SysconfigRead (.sysconfig.language.RC_LANG, "")); - use_utf8 = search (val, ".UTF-8") != nil; + if (val != "") + { + use_utf8 = search (val, ".UTF-8") != nil; + } } else { diff --git a/package/yast2-country.changes b/package/yast2-country.changes index 97bdf792..7f1c4caa 100644 --- a/package/yast2-country.changes +++ b/package/yast2-country.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed May 15 08:53:25 CEST 2013 - jsuchome@suse.cz + +- do not use non-UTF encoding fallback when nothing is configured + (bnc#815265) +- 2.17.54 + ------------------------------------------------------------------- Tue Feb 26 10:07:15 CET 2013 - jsuchome@suse.cz