summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.com>2008-08-18 14:35:29 +0000
committerOlivier Blin <oblin@mandriva.com>2008-08-18 14:35:29 +0000
commitcf462e7f67b1b777043e1db1b4787144d6ef0331 (patch)
treec299d273f42b11eff38cc58d06b3bc18dc600400
parent5b67be78ab572eec2ccdaf29f8ba6577920091fc (diff)
downloaddrakx-cf462e7f67b1b777043e1db1b4787144d6ef0331.tar
drakx-cf462e7f67b1b777043e1db1b4787144d6ef0331.tar.gz
drakx-cf462e7f67b1b777043e1db1b4787144d6ef0331.tar.bz2
drakx-cf462e7f67b1b777043e1db1b4787144d6ef0331.tar.xz
drakx-cf462e7f67b1b777043e1db1b4787144d6ef0331.zip
set locale at first step when language is selected in gfxmenu (#42299)
-rw-r--r--perl-install/NEWS2
-rwxr-xr-xperl-install/standalone/finish-install6
2 files changed, 6 insertions, 2 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index 94378ba60..e9d4cb06c 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,4 +1,6 @@
- do_pkgs: do not reload urpmi media at every check for package availability
+- finish-install: set locale at first step when language is selected
+ in gfxmenu (#42299)
Version 11.10.2 - 18 August 2008
diff --git a/perl-install/standalone/finish-install b/perl-install/standalone/finish-install
index 077060fd5..35fadb051 100755
--- a/perl-install/standalone/finish-install
+++ b/perl-install/standalone/finish-install
@@ -39,8 +39,10 @@ sub ask_language() {
require lang;
$locale = lang::read();
my ($lang) = cat_("/proc/cmdline") =~ /\blang=(.+?)\b/;
- put_in_hash($locale, lang::lang_to_ourlocale($lang))
- if $lang && member($lang, lang::list_langs(exclude_non_installed => 1));
+ if ($lang && member($lang, lang::list_langs(exclude_non_installed => 1))) {
+ put_in_hash($locale, lang::lang_to_ourlocale($lang));
+ lang::set($locale);
+ }
any::selectLanguage_and_more_standalone($in, $locale);
lang::write_and_install($locale, $in->do_pkgs);
}