From 135cb580abfc873836a029b30f42ed9e5f836750 Mon Sep 17 00:00:00 2001
From: Guillaume Cottenceau <gc@mandriva.com>
Date: Wed, 18 Feb 2004 17:08:01 +0000
Subject: selectlanguage: utf8 flag status is updated when user selects
 more/less languages; when user touches it, update is disabled, allowing
 andrej to have an en_GB + ru_RU install without utf8

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

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

diff --git a/perl-install/lang.pm b/perl-install/lang.pm
index 7deb012a2..fd591500c 100644
--- a/perl-install/lang.pm
+++ b/perl-install/lang.pm
@@ -840,11 +840,10 @@ sub langsLANGUAGE {
     uniq(map { split ':', getLANGUAGE($_, $o_c) } langs($l));
 }
 
-sub langs_selected {
+sub utf8_should_be_needed {
     my ($locale) = @_; 
-    #- adding the UTF-8 flag (if not forced) depends on the selected languages
-    $locale->{utf8} ||= l2charset($locale->{lang}) =~ /utf|unicode/
-			|| uniq(grep { $_ ne 'C' } map { l2charset($_) } langs($locale->{langs})) > 1;
+    l2charset($locale->{lang}) =~ /utf|unicode/
+      || uniq(grep { $_ ne 'C' } map { l2charset($_) } langs($locale->{langs})) > 1;
 }
 
 sub pack_langs { 
-- 
cgit v1.2.1