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/install2.pm | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'perl-install/install/install2.pm')

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
-- 
cgit v1.2.1