diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2004-04-26 09:41:02 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2004-04-26 09:41:02 +0000 |
| commit | 9541b286f75c46dc38d0fe849e66b54b82a473f9 (patch) | |
| tree | 4f58f3f16bd2816708de64aac8e0c88cfab8bd0f | |
| parent | 20b1581d830aa538d2d6bcfbea4e81830282a809 (diff) | |
| download | drakx-9541b286f75c46dc38d0fe849e66b54b82a473f9.tar drakx-9541b286f75c46dc38d0fe849e66b54b82a473f9.tar.gz drakx-9541b286f75c46dc38d0fe849e66b54b82a473f9.tar.bz2 drakx-9541b286f75c46dc38d0fe849e66b54b82a473f9.tar.xz drakx-9541b286f75c46dc38d0fe849e66b54b82a473f9.zip | |
utf8_should_be_needed() must return true if any of the languages chosen is utf8, not only the main one
(it also returns true when there are many charsets)
| -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 22d78b5ad..4cf8cd4cf 100644 --- a/perl-install/lang.pm +++ b/perl-install/lang.pm @@ -865,8 +865,8 @@ sub langsLANGUAGE { sub utf8_should_be_needed { my ($locale) = @_; - l2charset($locale->{lang}) =~ /utf|unicode/ - || uniq(grep { $_ ne 'C' } map { l2charset($_) } langs($locale->{langs})) > 1; + my @l = uniq(grep { $_ ne 'C' } map { l2charset($_) } langs($locale->{langs})); + @l > 1 || any { /utf|unicode/ } @l; } sub pack_langs { |