summaryrefslogtreecommitdiffstats
path: root/perl-install/share
diff options
context:
space:
mode:
authorPablo Saratxaga <pablo@mandriva.com>2002-12-05 13:38:14 +0000
committerPablo Saratxaga <pablo@mandriva.com>2002-12-05 13:38:14 +0000
commit50dda33228ca3131595b8c86ec8f1a60a49a61dc (patch)
tree5f40da73944bfdb857f0c227715176f884dec9ec /perl-install/share
parentd1edcf705a0386524862f26721e1d1e1c3883032 (diff)
downloaddrakx-50dda33228ca3131595b8c86ec8f1a60a49a61dc.tar
drakx-50dda33228ca3131595b8c86ec8f1a60a49a61dc.tar.gz
drakx-50dda33228ca3131595b8c86ec8f1a60a49a61dc.tar.bz2
drakx-50dda33228ca3131595b8c86ec8f1a60a49a61dc.tar.xz
drakx-50dda33228ca3131595b8c86ec8f1a60a49a61dc.zip
Changed the way locale->encoding is handled; revert to the old way which was
working. And changed the charset to use during install to UTF-8 for all but CJK locales, in the X11 locale config files and in lang.pm; So, the same values of LC_* variables are used as before; but they should point, in glibc and in X11, to UTF-8 locales now
Diffstat (limited to 'perl-install/share')
-rwxr-xr-xperl-install/share/gen_locales.sh23
-rw-r--r--perl-install/share/locales-skeleton.tar.bz2bin1347 -> 1777 bytes
2 files changed, 2 insertions, 21 deletions
diff --git a/perl-install/share/gen_locales.sh b/perl-install/share/gen_locales.sh
index b3f6b3c5d..652b82dd5 100755
--- a/perl-install/share/gen_locales.sh
+++ b/perl-install/share/gen_locales.sh
@@ -8,28 +8,9 @@ for i in LC_ADDRESS LC_COLLATE LC_CTYPE LC_IDENTIFICATION LC_MEASUREMENT LC_MONE
install -D -m 644 /usr/share/locale/UTF-8/$i usr/share/locale/UTF-8/$i
done
-# lc_ctype for common encoding
-for i in CP1251 ISO-8859-13 ISO-8859-14 ISO-8859-15 ISO-8859-2 ISO-8859-3 ISO-8859-7 ISO-8859-9 ISO-8859-9E ; do
- f=usr/share/locale/$i/LC_CTYPE
- [ -e /$f ] || { echo missing /$f ; exit 1 ; }
- install -D -m 644 /$f $f
- (cd usr/share/locale/$i ; ln -s ../UTF-8/* . 2>/dev/null)
-done
-
-# for non common encodings, build them locally to ensure they are present
-for i in ISO-8859-9E ARMSCII-8 GEORGIAN-ACADEMY KOI8-K TCVN-5712
-do
- /usr/bin/localedef -c -i en_US -f $i ./$i
-
- f=usr/share/locale/$i/LC_CTYPE
- [ -e ./$i/LC_CTYPE ] || { echo missing ./$i/LC_CTYPE ; exit 1 ; }
- install -D -m 644 ./$i/LC_CTYPE $f
- (cd usr/share/locale/$i ; ln -s ../UTF-8/* . 2>/dev/null)
-done
-
# lc_ctype for non common encodings
rm -rf .tmp2 ; mkdir .tmp2 ; cd .tmp2
-for i in ja ko ta th ; do
+for i in ja ko ; do
ii=locales-`echo $i | sed 's/\(..\).*/\1/'`
rpm2cpio /RPMS/$ii-*.rpm | cpio -id --quiet
f=usr/share/locale/$i/LC_CTYPE
@@ -59,7 +40,7 @@ cd .. ; rm -rf .tmp2
perl -I../.. ../gen_locales.pl || exit 1
-for i in common C armscii-8 en_US.UTF-8 georgian-ps iso8859-1 iso8859-13 iso8859-14 iso8859-15 iso8859-2 iso8859-3 iso8859-5 iso8859-7 iso8859-9 iso8859-9e ja ko koi8-r koi8-u koi8-k microsoft-cp1251 microsoft-cp1255 microsoft-cp1256 th_TH tscii-0 vi_VN.tcvn zh_CN zh_TW.big5 ; do
+for i in common C en_US.UTF-8 iso8859-1 ja ko tscii-0 zh_CN zh_TW.big5 ; do
cp -a /usr/X11R6/lib/X11/locale/$i usr/X11R6/lib/X11/locale
done
diff --git a/perl-install/share/locales-skeleton.tar.bz2 b/perl-install/share/locales-skeleton.tar.bz2
index 104990d03..0bf8c6ad2 100644
--- a/perl-install/share/locales-skeleton.tar.bz2
+++ b/perl-install/share/locales-skeleton.tar.bz2
Binary files differ