summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2002-07-26 10:39:28 +0000
committerPascal Rigaux <pixel@mandriva.com>2002-07-26 10:39:28 +0000
commitd78db2abda5a92d8eb8459ace061f1380060d5e2 (patch)
tree01401ba7112592cc83f0c66d6302666e334a8b4b
parent111ded76b6ecb639f2ba47b8f5aaa778bae9cb98 (diff)
downloaddrakx-backup-do-not-use-d78db2abda5a92d8eb8459ace061f1380060d5e2.tar
drakx-backup-do-not-use-d78db2abda5a92d8eb8459ace061f1380060d5e2.tar.gz
drakx-backup-do-not-use-d78db2abda5a92d8eb8459ace061f1380060d5e2.tar.bz2
drakx-backup-do-not-use-d78db2abda5a92d8eb8459ace061f1380060d5e2.tar.xz
drakx-backup-do-not-use-d78db2abda5a92d8eb8459ace061f1380060d5e2.zip
hy is now using UTF8 locales
-rw-r--r--perl-install/lang.pm4
-rwxr-xr-xperl-install/share/gen_locales.sh2
2 files changed, 3 insertions, 3 deletions
diff --git a/perl-install/lang.pm b/perl-install/lang.pm
index ea9a39f20..35a12953c 100644
--- a/perl-install/lang.pm
+++ b/perl-install/lang.pm
@@ -371,7 +371,7 @@ my %lang2country = (
);
-my @during_install__lang_having_their_LC_CTYPE = qw(hy ja ko th vi);
+my @during_install__lang_having_their_LC_CTYPE = qw(ja ko th vi);
#-######################################################################################
#- Functions
@@ -825,7 +825,7 @@ sub during_install__lang2charset {
$c = 'cp1251' if $c =~ /koi8-/;
$c = 'iso-8859-15' if member($c, 'iso-8859-1', 'C');
$c = 'UTF-8' if member($c, 'unicode', 'utf_ka');
- $c = 'UTF-8' if member($c, 'iso-8859-9e', 'iso-8859-8', 'iso-8859-6'); #- BAD, need fixing
+ $c = 'UTF-8' if member($c, 'armscii-8', 'iso-8859-9e', 'iso-8859-8', 'iso-8859-6'); #- BAD, need fixing
uc($c);
}
diff --git a/perl-install/share/gen_locales.sh b/perl-install/share/gen_locales.sh
index afd6298c6..f2fc0cf3a 100755
--- a/perl-install/share/gen_locales.sh
+++ b/perl-install/share/gen_locales.sh
@@ -17,7 +17,7 @@ for i in CP1251 ISO-8859-13 ISO-8859-14 ISO-8859-15 ISO-8859-2 ISO-8859-3 ISO-88
done
rm -rf .tmp2 ; mkdir .tmp2 ; cd .tmp2
-for i in hy ja ko th vi ; do
+for i in ja ko th vi ; do
ii=locales-`echo $i | sed 's/\(..\).*/\1/'`
rpm2cpio /RPMS/$ii-*.rpm | cpio -id --quiet
f=usr/share/locale/$i/LC_CTYPE