From 901f3f8e24d58d0d1d553c4424b8bdb3e84440b7 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Tue, 18 Mar 2008 15:41:25 +0000
Subject: - fix setting default lang (which is given by gfxboot)

nb: one must not set $o->{locale}{lang} directly, otherwise
$o->{locale}{country} will not have a valid value, hence some issues...
---
 perl-install/install/NEWS        | 1 +
 perl-install/install/install2.pm | 9 +++++++--
 perl-install/install/steps.pm    | 2 --
 3 files changed, 8 insertions(+), 4 deletions(-)

(limited to 'perl-install')

diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index 698d07f78..979fce870 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -2,6 +2,7 @@
   o display kdm/gdm icon again (was disabled on year ago)
 - do not write aliases for asus_acpi and thinkpad_acpi in
   modprobe.preload, the modules are now handled by coldplug
+- fix setting default lang (which is given by gfxboot)
 
 Version 10.15 - 14 March 2008
 
diff --git a/perl-install/install/install2.pm b/perl-install/install/install2.pm
index c18fb03cf..56226b55d 100644
--- a/perl-install/install/install2.pm
+++ b/perl-install/install/install2.pm
@@ -333,8 +333,8 @@ sub main {
     map_each {
 	my ($n, $v) = @_;
 	my $f = ${{
-	    lang      => sub { $o->{locale}{lang} = $v },
-	    flang     => sub { $o->{locale}{lang} = $v; push @::auto_steps, 'selectLanguage' },
+	    lang      => sub { $o->{lang} = $v },
+	    flang     => sub { $o->{lang} = $v; push @::auto_steps, 'selectLanguage' },
 	    langs     => sub { $o->{locale}{langs} = +{ map { $_ => 1 } split(':', $v) } },
 	    method    => sub { $o->{method} = $v },
 	    pcmcia    => sub { $o->{pcmcia} = $v },
@@ -520,6 +520,11 @@ sub main {
 	mouse::load_modules($o->{mouse});
     }
 
+    #- for auto_install compatibility with old $o->{lang},
+    #- and also for --lang and --flang
+    if ($o->{lang}) {
+	put_in_hash($o->{locale}, lang::system_locales_to_ourlocale($o->{lang}, $o->{lang}));
+    }
     lang::set($o->{locale});
 
     # keep the result otherwise monitor-edid does not return good results afterwards
diff --git a/perl-install/install/steps.pm b/perl-install/install/steps.pm
index 6eee0a30b..555fc9254 100644
--- a/perl-install/install/steps.pm
+++ b/perl-install/install/steps.pm
@@ -103,8 +103,6 @@ sub kill_action {}
 sub selectLanguage {
     my ($o) = @_;
 
-    #- for auto_install compatibility with old $o->{lang}
-    $o->{locale} = lang::system_locales_to_ourlocale($o->{lang}, $o->{lang}) if $o->{lang};
     $o->{locale}{langs} ||= { $o->{locale}{lang} => 1 };
 
     if (!exists $o->{locale}{country}) {
-- 
cgit v1.2.1