Attachment 212953 Details for Bug 381415

[patch] patch for /usr/share/YaST2/modules/Language.ycp

Language.diff (text/plain), 1.38 KB, created by Jiří Suchomel on 2008-05-07 07:02:02 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jiří Suchomel

Created: 2008-05-07 07:02:02 UTC

Size: 1.38 KB

patch

obsolete

>Index: Language.ycp
>===================================================================
>--- Language.ycp	(revision 47317)
>+++ Language.ycp	(working copy)
>@@ -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)
>     {

Actions: View | Diff

Attachments on bug 381415: 209022 | 212117 | 212715 | 212953