diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2007-09-27 07:34:09 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2007-09-27 07:34:09 +0000 |
| commit | 22524422dc1cbfa36e56b08962068b3b4fac48f6 (patch) | |
| tree | 291a7b3e9188c1698b1129f0d1686e5d5ca86b09 | |
| parent | a043aa6a818de13d28caf7426812151152064290 (diff) | |
| download | drakx-22524422dc1cbfa36e56b08962068b3b4fac48f6.tar drakx-22524422dc1cbfa36e56b08962068b3b4fac48f6.tar.gz drakx-22524422dc1cbfa36e56b08962068b3b4fac48f6.tar.bz2 drakx-22524422dc1cbfa36e56b08962068b3b4fac48f6.tar.xz drakx-22524422dc1cbfa36e56b08962068b3b4fac48f6.zip | |
- localedrake:
o allow to choose countries like "Angola" which have no locale (pt_AO) in
the "best" countries (alas it won't be remembered, will only be used in
kde settings for now)
- a solution could be to put pt_AO in LANGUAGE?
- another solution would be to really use LC_*=pt_AO, it should not be an issue
since it will use pt which really is pt_PT
| -rw-r--r-- | perl-install/NEWS | 4 | ||||
| -rw-r--r-- | perl-install/any.pm | 9 | ||||
| -rw-r--r-- | perl-install/install/NEWS | 4 |
3 files changed, 12 insertions, 5 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS index 61d12816a..f383766cb 100644 --- a/perl-install/NEWS +++ b/perl-install/NEWS @@ -1,3 +1,7 @@ +- localedrake: + o allow to choose countries like "Angola" which have no locale (en_AO) in + the "best" countries (alas it won't be remembered, will only be used in + kde settings for now) - finish-install: o display nicer HTML release notes rather than raw text version diff --git a/perl-install/any.pm b/perl-install/any.pm index 7ca204b1f..5afe8d2d9 100644 --- a/perl-install/any.pm +++ b/perl-install/any.pm @@ -1034,11 +1034,10 @@ sub selectCountry { my $country = $locale->{country}; my @countries = lang::list_countries(exclude_non_installed => !$::isInstall); - my @best = uniq map { - my $h = lang::analyse_locale_name($_); - if_($h->{main} eq lang::locale_to_main_locale($locale->{lang}) && $h->{country}, - $h->{country}); - } @lang::locales; + my @best = grep { + my $h = lang::analyse_locale_name(lang::c2locale($_)); + $h->{main} eq lang::locale_to_main_locale($locale->{lang}); + } @countries; @best == 1 and @best = (); my $other = !member($country, @best); diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS index b129123a7..5b916f6a7 100644 --- a/perl-install/install/NEWS +++ b/perl-install/install/NEWS @@ -1,3 +1,7 @@ +- allow to choose countries like "Angola" which have no locale (en_AO) in the + "best" countries (alas it won't be remembered, will only be used in kde + settings for now) + Version 10.4.215 - 26 September 2007, by Thierry Vignaud - display nicer HTML release notes rather than raw text version |