From 8923219f1ad7c02035f2060fbddedff45b674891 Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <tv@mandriva.org>
Date: Mon, 20 Apr 2009 22:26:36 +0000
Subject: (ask_language) handle both "ll_CC" and "ll" locales parameter
 (#49914)

---
 perl-install/NEWS                      | 2 ++
 perl-install/standalone/finish-install | 5 +++--
 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);
-- 
cgit v1.2.1