From 77278a698e503fb739989843801f7b70a64630d2 Mon Sep 17 00:00:00 2001
From: Guillaume Cottenceau <gc@mandriva.com>
Date: Mon, 10 Mar 2003 13:59:30 +0000
Subject: fix original #2842 problem

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

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

diff --git a/perl-install/lang.pm b/perl-install/lang.pm
index 858d61640..e51e45fba 100644
--- a/perl-install/lang.pm
+++ b/perl-install/lang.pm
@@ -806,6 +806,13 @@ sub langsLANGUAGE {
     uniq(map { split ':', getLANGUAGE($_, $c) } langs($l));
 }
 
+sub langs_selected {
+    my ($locale) = @_; 
+    #- adding the UTF-8 flag (if not forced) depends on the selected languages
+    $locale->{utf8} ||= l2charset($locale->{lang}) =~ /utf|unicode/
+			|| (uniq map { l2charset($_) } langs($locale->{langs})) > 1;
+}
+
 sub pack_langs { 
     my ($l) = @_; 
     my $s = $l->{all} ? 'all' : join ':', uniq(map { getLANGUAGE($_) } langs($l));
@@ -849,8 +856,6 @@ sub write {
 
     $locale && $locale->{lang} or return;
 
-    $locale->{utf8} ||= l2charset($locale->{lang}) =~ /utf|unicode/
-			|| (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});
 
-- 
cgit v1.2.1