From f535654a5ea847cdfc5220208092c6d96d076950 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Wed, 12 May 2004 11:05:34 +0000
Subject: - fix typo - fix last commit which was not using $locale_country as
 it should in system_locales_to_ourlocale()

---
 perl-install/lang.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/perl-install/lang.pm b/perl-install/lang.pm
index 4db0abbb4..f68bcaf3f 100644
--- a/perl-install/lang.pm
+++ b/perl-install/lang.pm
@@ -896,13 +896,13 @@ sub pack_langs {
 sub system_locales_to_ourlocale {
     my ($locale_lang, $locale_country) = @_;
     my $locale = {};
-    my $h = analysed_locale($locale_lang);
+    my $h = analyse_locale_name($locale_lang);
     my $locale_lang_no_encoding = join('_', $h->{main}, if_($h->{country}, $h->{country}));
     $locale->{lang} = member($locale_lang_no_encoding, list_langs()) ?
 	$locale_lang_no_encoding : #- special lang's such as en_US pt_BR
 	$h->{main};
     $locale->{lang} .= '@' . $h->{variant} if $h->{variant};
-    $locale->{country} = $h->{country};
+    $locale->{country} = analyse_locale_name($locale_country)->{country};
     $locale->{utf8} = $h->{encoding} eq 'UTF-8';
     #- safe fallbacks
     $locale->{lang} ||= 'en_US';
-- 
cgit v1.2.1