summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuillaume Cottenceau <gc@mandriva.com>2003-02-19 22:21:13 +0000
committerGuillaume Cottenceau <gc@mandriva.com>2003-02-19 22:21:13 +0000
commit8a20dfa8612a1727005c79b932cb33f5f1689182 (patch)
treeb84a1c2f5e69207ebbcba002fa14c61744ab617c
parent230a7d7c3df0515ec3bb318e12c1b91d26f53544 (diff)
downloaddrakx-8a20dfa8612a1727005c79b932cb33f5f1689182.tar
drakx-8a20dfa8612a1727005c79b932cb33f5f1689182.tar.gz
drakx-8a20dfa8612a1727005c79b932cb33f5f1689182.tar.bz2
drakx-8a20dfa8612a1727005c79b932cb33f5f1689182.tar.xz
drakx-8a20dfa8612a1727005c79b932cb33f5f1689182.zip
I'm stupid, we need to set UTF8 when there are two installed
langs with different encodings, not just when the additional languages have different encoding than main one
-rw-r--r--perl-install/lang.pm2
1 files changed, 1 insertions, 1 deletions
diff --git a/perl-install/lang.pm b/perl-install/lang.pm
index b16c8fc5c..298d57860 100644
--- a/perl-install/lang.pm
+++ b/perl-install/lang.pm
@@ -806,7 +806,7 @@ sub write {
$locale && $locale->{lang} or return;
$locale->{utf8} ||= l2charset($locale->{lang}) =~ /utf|unicode/
- || any { l2charset($_) ne l2charset($locale->{lang}) } langs($locale->{langs});
+ || (uniq map { l2charset($_) } langs($locale->{langs})) > 1;
my $locale_lang = getlocale_for_lang($locale->{lang}, $locale->{country}, $locale->{utf8});
my $locale_country = getlocale_for_country($locale->{lang}, $locale->{country}, $locale->{utf8});