summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorPablo Saratxaga <pablo@mandriva.com>2004-08-10 07:49:51 +0000
committerPablo Saratxaga <pablo@mandriva.com>2004-08-10 07:49:51 +0000
commitc105d33ecddeb86f2fa5516395a5c5521294aa5b (patch)
treed3ffb7666f11d35caf2930aaa1aae233cbffc16f /perl-install
parent7a88b1a33f87498cb35dbb7bebbb63ea10c70d51 (diff)
downloaddrakx-c105d33ecddeb86f2fa5516395a5c5521294aa5b.tar
drakx-c105d33ecddeb86f2fa5516395a5c5521294aa5b.tar.gz
drakx-c105d33ecddeb86f2fa5516395a5c5521294aa5b.tar.bz2
drakx-c105d33ecddeb86f2fa5516395a5c5521294aa5b.tar.xz
drakx-c105d33ecddeb86f2fa5516395a5c5521294aa5b.zip
updated use UTF-8 locales for everything
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/share/gen_locales.pl6
-rwxr-xr-xperl-install/share/gen_locales.sh32
-rw-r--r--perl-install/share/locales-skeleton.tar.bz2bin1777 -> 1664 bytes
3 files changed, 3 insertions, 35 deletions
diff --git a/perl-install/share/gen_locales.pl b/perl-install/share/gen_locales.pl
index 93820bca7..4928ff8c8 100644
--- a/perl-install/share/gen_locales.pl
+++ b/perl-install/share/gen_locales.pl
@@ -4,11 +4,9 @@ use MDK::Common;
use lang;
foreach (lang::list_langs()) {
- my $c = lang::during_install__l2charset($_) or next;
- -e "usr/share/locale/$c" or warn("not handled lang $_ (charset $c)\n"), next;
if (my $exist = readlink "usr/share/locale/$_") {
- $exist eq $c or die "symlink $_ already exist and is $exist instead of $c\n";
+ die "symlink $_ already exist and is $exist\n";
} else {
- symlink $c, "usr/share/locale/$_" or die "can't create symlink $_";
+ symlink "UTF-8", "usr/share/locale/$_" or die "can't create symlink $_";
}
}
diff --git a/perl-install/share/gen_locales.sh b/perl-install/share/gen_locales.sh
index 78ee7f657..ecc13e809 100755
--- a/perl-install/share/gen_locales.sh
+++ b/perl-install/share/gen_locales.sh
@@ -8,39 +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 non common encodings
-rm -rf .tmp2 ; mkdir .tmp2 ; cd .tmp2
-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
- [ -e $f ] || { echo missing $f in package $ii ; exit 1 ; }
- install -D -m 644 $f ../$f
- (cd ../usr/share/locale/$i ; ln -s ../UTF-8/* . 2>/dev/null)
- rm -rf *
-done
-cd .. ; rm -rf .tmp2
-
-# special case for chineese (why is it needed?)
-rm -rf .tmp2 ; mkdir .tmp2 ; cd .tmp2
-for i in zh_CN.GB2312 zh_TW.Big5 ; do
- ii=locales-`echo $i | sed 's/\(..\).*/\1/'`
- rpm2cpio /RPMS/$ii-*.rpm | cpio -id --quiet
- for f in LC_ADDRESS LC_COLLATE LC_CTYPE LC_IDENTIFICATION LC_MEASUREMENT LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER LC_TELEPHONE LC_TIME LC_MESSAGES/SYS_LC_MESSAGES ; do
- f=usr/share/locale/$i/$f
- [ -e $f ] || { echo missing $f in package $ii ; exit 1 ; }
- install -D -m 644 $f ../$f
- done
- rm -rf *
-done
-cd .. ; rm -rf .tmp2
-
-(cd usr/share/locale ; mv zh_CN.GB2312 GB2312 ; mv zh_TW.Big5 BIG5)
-
perl -I../.. ../gen_locales.pl || exit 1
-
-for i in C en_US.UTF-8 iso8859-1 ja ko zh_CN zh_TW.big5 ; do
+for i in C en_US.UTF-8 iso8859-1 ; 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 0bf8c6ad2..47b88cf37 100644
--- a/perl-install/share/locales-skeleton.tar.bz2
+++ b/perl-install/share/locales-skeleton.tar.bz2
Binary files differ