diff options
author | Pascal Rigaux <pixel@mandriva.com> | 2004-05-12 11:05:34 +0000 |
---|---|---|
committer | Pascal Rigaux <pixel@mandriva.com> | 2004-05-12 11:05:34 +0000 |
commit | f535654a5ea847cdfc5220208092c6d96d076950 (patch) | |
tree | 53bd7834c94626dc3317be483d37f84bdd88b8a9 | |
parent | 48fb1a15342abff057320bccc679aad46b1d6503 (diff) | |
download | drakx-f535654a5ea847cdfc5220208092c6d96d076950.tar drakx-f535654a5ea847cdfc5220208092c6d96d076950.tar.gz drakx-f535654a5ea847cdfc5220208092c6d96d076950.tar.bz2 drakx-f535654a5ea847cdfc5220208092c6d96d076950.tar.xz drakx-f535654a5ea847cdfc5220208092c6d96d076950.zip |
- fix typo
- fix last commit which was not using $locale_country as it should in system_locales_to_ourlocale()
-rw-r--r-- | perl-install/lang.pm | 4 |
1 files 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'; |