View | Details | Raw Unified | Return to bug 381415
Collapse All | Expand All

(-)Language.ycp (-3 / +8 lines)
Lines 352-358 Link Here
352
352
353
    if (language != lang)	// Do it only if different
353
    if (language != lang)	// Do it only if different
354
    {
354
    {
355
	if (Stage::initial () && !Mode::test ())
355
	if (Stage::initial () && !Mode::test () && !Mode::live_installation ())
356
	{
356
	{
357
	    y2milestone ("integrating translation extension...");
357
	    y2milestone ("integrating translation extension...");
358
	    // busy message
358
	    // busy message
Lines 493-499 Link Here
493
global define void ReadSysconfigValues () {
493
global define void ReadSysconfigValues () {
494
494
495
    rootlang = Misc::SysconfigRead (.sysconfig.language.ROOT_USES_LANG, rootlang);
495
    rootlang = Misc::SysconfigRead (.sysconfig.language.ROOT_USES_LANG, rootlang);
496
    if (!Stage::initial ())
496
    // during live installation, we have sysconfig.language.RC_LANG available
497
    if (!Stage::initial () || Mode::live_installation ())
497
    {
498
    {
498
	string val = toupper (Misc::SysconfigRead (.sysconfig.language.RC_LANG, ""));
499
	string val = toupper (Misc::SysconfigRead (.sysconfig.language.RC_LANG, ""));
499
	use_utf8 = search (val, ".UTF-8") != nil;
500
	use_utf8 = search (val, ".UTF-8") != nil;
Lines 521-527 Link Here
521
	return;
522
	return;
522
    }
523
    }
523
524
524
    if (Stage::initial ())
525
    if (Stage::initial () && !Mode::live_installation ())
525
    {
526
    {
526
	string lang = (string)SCR::Read (.content.LANGUAGE);
527
	string lang = (string)SCR::Read (.content.LANGUAGE);
527
	y2milestone ("content LANGUAGE %1", lang);
528
	y2milestone ("content LANGUAGE %1", lang);
Lines 563-568 Link Here
563
	string local_lang = ReadSysconfigLanguage ();
564
	string local_lang = ReadSysconfigLanguage ();
564
	QuickSet (local_lang);
565
	QuickSet (local_lang);
565
	SetDefault();		// also default
566
	SetDefault();		// also default
567
	if (Mode::live_installation ())
568
	{
569
	    FillEnglishNames (local_lang);
570
	}
566
    }
571
    }
567
    if (SCR::Read (.target.size, "/etc/sysconfig/language") > 0)
572
    if (SCR::Read (.target.size, "/etc/sysconfig/language") > 0)
568
    {
573
    {

Return to bug 381415