From 73db908923f37f3494c7cfa334c8eb650c999260 Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <tv@mandriva.org>
Date: Tue, 12 Aug 2008 10:10:07 +0000
Subject: default to UTF-8 for chinese simplified (#42137)

---
 perl-install/NEWS         | 3 +++
 perl-install/any.pm       | 2 +-
 perl-install/install/NEWS | 2 ++
 3 files changed, 6 insertions(+), 1 deletion(-)

(limited to 'perl-install')

diff --git a/perl-install/NEWS b/perl-install/NEWS
index 72530859e..9898525a8 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,3 +1,6 @@
+- localedrake:
+  o default to UTF-8 for chinese simplified (#42137)
+
 Version 11.6 - 8 August 2008
 
 - add product type to URL when fetching mirror list
diff --git a/perl-install/any.pm b/perl-install/any.pm
index 1b83e7e71..999cf07b6 100644
--- a/perl-install/any.pm
+++ b/perl-install/any.pm
@@ -982,7 +982,7 @@ when your installation is complete and you restart your system.")),
 	  format => sub { $_[0] =~ /(.*\|)(.*)/ ? $1 . lang::l2name($2) : lang::l2name($_[0]) },
 	  list => \@langs, sort => !$in->isa('interactive::gtk'), changed => sub { 
 	      #- very special cases for langs which do not like UTF-8
-	      $non_utf8 = $lang =~ /\bzh/ if !$utf8_forced;
+	      $non_utf8 = $lang =~ /\bzh_TW/i if !$utf8_forced;
 	  }, focus_out => sub { $langs->{$listval2val->($lang)} = 1 } },
 	  { val => \$non_utf8, type => 'bool', text => N("Old compatibility (non UTF-8) encoding"), 
 	    advanced => 1, changed => sub { $utf8_forced = 1 } },
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index dcdba7da3..f010e141a 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,3 +1,5 @@
+- default to UTF-8 for chinese simplified (#42137)
+
 Version 11.7 - 11 August 2008
 
 - handle new drivers:
-- 
cgit v1.2.1