From 9541b286f75c46dc38d0fe849e66b54b82a473f9 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Mon, 26 Apr 2004 09:41:02 +0000
Subject: 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)

---
 perl-install/lang.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'perl-install/lang.pm')

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 { 
-- 
cgit v1.2.1