summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mandriva.org>2009-04-20 22:26:36 +0000
committerThierry Vignaud <tv@mandriva.org>2009-04-20 22:26:36 +0000
commit8923219f1ad7c02035f2060fbddedff45b674891 (patch)
treef7b948d5988c2f73683870b90c088594b76d81d0
parent0756f81db4bc8da0f5d5fd149d448a95e43535bf (diff)
downloaddrakx-8923219f1ad7c02035f2060fbddedff45b674891.tar
drakx-8923219f1ad7c02035f2060fbddedff45b674891.tar.gz
drakx-8923219f1ad7c02035f2060fbddedff45b674891.tar.bz2
drakx-8923219f1ad7c02035f2060fbddedff45b674891.tar.xz
drakx-8923219f1ad7c02035f2060fbddedff45b674891.zip
(ask_language) handle both "ll_CC" and "ll" locales parameter (#49914)
-rw-r--r--perl-install/NEWS2
-rwxr-xr-xperl-install/standalone/finish-install5
2 files changed, 5 insertions, 2 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index a52da1e89..30bd01d74 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,3 +1,5 @@
+- finish-install:
+ o handle both "ll_CC" and "ll" locales parameter (#48352)
- harddrake:
o do not offer to install java plugin (#48520)
diff --git a/perl-install/standalone/finish-install b/perl-install/standalone/finish-install
index d751edeaa..2034ca255 100755
--- a/perl-install/standalone/finish-install
+++ b/perl-install/standalone/finish-install
@@ -40,8 +40,9 @@ sub ask_language() {
require lang;
$locale = lang::read();
my ($lang) = cat_("/proc/cmdline") =~ /\blang=(.+?)\b/;
- if ($lang && member($lang, lang::list_langs(exclude_non_installed => 1))) {
- put_in_hash($locale, lang::lang_to_ourlocale($lang));
+ my $h = lang::lang_to_ourlocale($lang);
+ if ($lang && member($h->{lang}, lang::list_langs(exclude_non_installed => 1))) {
+ put_in_hash($locale, $h);
lang::set($locale);
}
any::selectLanguage_standalone($in, $locale);