Author: jsuchome Date: Wed May 7 12:31:55 2008 New Revision: 47343 URL: http://svn.opensuse.org/viewcvs/yast?rev=47343&view=rev Log: - during live-install, do not behave like in 1st stage (bnc#381415) - 2.16.22 Modified: trunk/country/VERSION trunk/country/language/src/modules/Language.ycp trunk/country/package/yast2-country.changes Modified: trunk/country/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/country/VERSION?rev=47343&r1=47342&r2=47343&view=diff ============================================================================== --- trunk/country/VERSION (original) +++ trunk/country/VERSION Wed May 7 12:31:55 2008 @@ -1 +1 @@ -2.16.21 +2.16.22 Modified: trunk/country/language/src/modules/Language.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/country/language/src/modules/Language.ycp?rev=47343&r1=47342&r2=47343&view=diff ============================================================================== --- trunk/country/language/src/modules/Language.ycp (original) +++ trunk/country/language/src/modules/Language.ycp Wed May 7 12:31:55 2008 @@ -352,7 +352,7 @@ if (language != lang) // Do it only if different { - if (Stage::initial () && !Mode::test ()) + if (Stage::initial () && !Mode::test () && !Mode::live_installation ()) { y2milestone ("integrating translation extension..."); // busy message @@ -493,7 +493,8 @@ global define void ReadSysconfigValues () { rootlang = Misc::SysconfigRead (.sysconfig.language.ROOT_USES_LANG, rootlang); - if (!Stage::initial ()) + // during live installation, we have sysconfig.language.RC_LANG available + if (!Stage::initial () || Mode::live_installation ()) { string val = toupper (Misc::SysconfigRead (.sysconfig.language.RC_LANG, "")); use_utf8 = search (val, ".UTF-8") != nil; @@ -521,7 +522,7 @@ return; } - if (Stage::initial ()) + if (Stage::initial () && !Mode::live_installation ()) { string lang = (string)SCR::Read (.content.LANGUAGE); y2milestone ("content LANGUAGE %1", lang); @@ -563,6 +564,10 @@ string local_lang = ReadSysconfigLanguage (); QuickSet (local_lang); SetDefault(); // also default + if (Mode::live_installation ()) + { + FillEnglishNames (local_lang); + } } if (SCR::Read (.target.size, "/etc/sysconfig/language") > 0) { Modified: trunk/country/package/yast2-country.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/country/package/yast2-country.changes?rev=47343&r1=47342&r2=47343&view=diff ============================================================================== --- trunk/country/package/yast2-country.changes (original) +++ trunk/country/package/yast2-country.changes Wed May 7 12:31:55 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed May 7 12:21:03 CEST 2008 - jsuchome@suse.cz + +- during live-install, do not behave like in 1st stage (bnc#381415) +- 2.16.22 + +------------------------------------------------------------------- Tue May 6 13:26:08 CEST 2008 - jsuchome@suse.cz - load correct language image for pt_PT (bnc#386298) -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org