diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2002-02-27 10:39:40 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2002-02-27 10:39:40 +0000 |
| commit | 96df26b3c72f48ddcd5ac906520ae3ec80fe38f6 (patch) | |
| tree | 07939c1eac533a74a642f15ee3cd204f11937160 | |
| parent | f2b94cc98739fe62a8ecd5647ac89338d44571a4 (diff) | |
| download | drakx-96df26b3c72f48ddcd5ac906520ae3ec80fe38f6.tar drakx-96df26b3c72f48ddcd5ac906520ae3ec80fe38f6.tar.gz drakx-96df26b3c72f48ddcd5ac906520ae3ec80fe38f6.tar.bz2 drakx-96df26b3c72f48ddcd5ac906520ae3ec80fe38f6.tar.xz drakx-96df26b3c72f48ddcd5ac906520ae3ec80fe38f6.zip | |
- %lang2country is the authority, so if the country given by %lang2country doesn't exist in KDE, return C
- fix be,sp,sr
| -rw-r--r-- | perl-install/lang.pm | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/perl-install/lang.pm b/perl-install/lang.pm index ae361062f..05b70d665 100644 --- a/perl-install/lang.pm +++ b/perl-install/lang.pm @@ -410,6 +410,7 @@ my %charset2kde_charset = ( #- for special cases not handled magically my %lang2country = ( ar => 'eg', + be => 'by', bs => 'bh', cs => 'cz', da => 'dk', @@ -420,8 +421,7 @@ my %lang2country = ( ms => 'my', nn => 'no', sl => 'si', - sp => 'yu', - sr => 'yu', + sp => 'sr', sv => 'se', ); @@ -458,7 +458,9 @@ sub lang2country { }; my $country; - $country ||= $valid_country->($lang2country{$lang}); + if ($country ||= $lang2country{$lang}) { + return $valid_country->($country) ? $country : 'C'; + } $country ||= $valid_country->(lc($1)) if $lang =~ /([A-Z]+)/; $country ||= $valid_country->(lc($1)) if lang2LANGUAGE($lang) =~ /([A-Z]+)/; $country ||= $valid_country->(substr($lang, 0, 2)); |