diff options
| -rw-r--r-- | perl-install/lang.pm | 13 | ||||
| -rw-r--r-- | perl-install/pkgs.pm | 10 |
2 files changed, 11 insertions, 12 deletions
diff --git a/perl-install/lang.pm b/perl-install/lang.pm index 1a41ad467..b679e0fb9 100644 --- a/perl-install/lang.pm +++ b/perl-install/lang.pm @@ -17,11 +17,11 @@ use log; #- [2] = value for $LANG, [3] = value for LANGUAGE (a list of possible #- languages, carefully choosen) my %languages = ( -'en_US' => [ 'English (US)', 'iso-8859-1', 'en', 'en_US:en' ], +'en_US' => [ 'English (US)', 'iso-8859-1', 'en', 'en_US:en' ], 'en_GB' => [ 'English (UK)', 'iso-8859-1', 'en', 'en_GB:en' ], 'af' => [ 'Afrikaans', 'iso-8859-1', 'af', 'af:en_ZA' ], 'ar' => [ 'Arabic', 'iso-8859-6', 'ar', 'ar' ], -'be_BY.CP1251' => [ 'Belarussian', 'cp1251', 'be', 'be:be_BY.CP1251' ], +'be_BY.CP1251' => [ 'Belarussian', 'cp1251', 'be', 'be:be_BY.CP1251:ru_RU.CP1251' ], #- provide aliases for some not very standard names used in po files... 'bg_BG' => [ 'Bulgarian', 'cp1251', 'bg', 'bg:bg.CP1251:bg_BG.CP1251' ], 'br' => [ 'Brezhoneg', 'iso-8859-1', 'br', 'br:fr_FR:fr' ], @@ -95,7 +95,7 @@ my %languages = ( 'wa' => [ 'Walon', 'iso-8859-1', 'wa', 'wa:fr_BE:fr' ], #-'yi' => [ 'Yiddish', 'cp1255', 'yi', 'yi' ], 'zh_TW.Big5' => [ 'Chinese (Big5)', 'Big5', 'zh_TW.Big5', 'zh_TW.Big5:zh_TW.big5:zh' ], -'zh_CN' => [ 'Chinese (GuoBiao)', 'gb2312', 'zh_CN', 'zh_CN:zh_CN.GB2312:zh_CN.gb2312:zh' ], +'zh_CN' => [ 'Chinese (GuoBiao)', 'gb2312', 'zh_CN.GB2312', 'zh_CN.GB2312:zh_CN.gb2312:zh_CN:zh' ], ); my %xim = ( @@ -104,10 +104,10 @@ my %xim = ( XIM => 'xcin', XMODIFIERS => '"@im=xcin"', }, - 'zh_CN' => { + 'zh_CN.GB2312' => { ENC => 'gb', - XIM => 'xcin-zh_CN', - XMODIFIERS => '"@im=xcin-zh_CN"', + XIM => 'xcin-zh_CN.GB2312', + XMODIFIERS => '"@im=xcin-zh_CN.GB2312"', }, 'ko' => { ENC => 'kr', @@ -271,7 +271,6 @@ sub write { my $c = $charsets{$l->[1] || ''}; if ($c) { my $p = "$prefix/usr/lib/kbd"; - add2hash $h, { CHARSET => $c }; if ($c->[0]) { add2hash $h, { SYSFONT => $c->[0] }; eval { diff --git a/perl-install/pkgs.pm b/perl-install/pkgs.pm index b465a4a4f..a9096a51f 100644 --- a/perl-install/pkgs.pm +++ b/perl-install/pkgs.pm @@ -51,8 +51,8 @@ autoirpm autoirpm-icons numlock %by_lang = ( 'ar' => [ 'acon' ], -# 'be' => [ 'fonts-ttf-cyrillic' ], -# 'bg' => [ 'fonts-ttf-cyrillic' ], +# 'be_BE.CP1251' => [ 'fonts-ttf-cyrillic' ], +#'bg_BG' => [ 'fonts-ttf-cyrillic' ], 'cs' => [ 'XFree86-ISO8859-2', 'XFree86-ISO8859-2-75dpi-fonts' ], # 'cy' => iso8859-14 fonts # 'el' => greek fonts @@ -70,7 +70,7 @@ autoirpm autoirpm-icons numlock # 'mk' => [ 'fonts-ttf-cyrillic' ], 'pl' => [ 'XFree86-ISO8859-2', 'XFree86-ISO8859-2-75dpi-fonts' ], 'ro' => [ 'XFree86-ISO8859-2', 'XFree86-ISO8859-2-75dpi-fonts' ], -# 'ru' => [ 'XFree86-cyrillic-fonts', 'fonts-ttf-cyrillic' ], +# 'ru_RU.KOI8-R' => [ 'XFree86-cyrillic-fonts', 'fonts-ttf-cyrillic' ], 'ru' => [ 'XFree86-cyrillic-fonts' ], 'sk' => [ 'XFree86-ISO8859-2', 'XFree86-ISO8859-2-75dpi-fonts' ], 'sl' => [ 'XFree86-ISO8859-2', 'XFree86-ISO8859-2-75dpi-fonts' ], @@ -78,10 +78,10 @@ autoirpm autoirpm-icons numlock 'sr' => [ 'XFree86-ISO8859-2', 'XFree86-ISO8859-2-75dpi-fonts' ], # 'th' => thai fonts 'tr' => [ 'XFree86-ISO8859-9', 'XFree86-ISO8859-9-75dpi-fonts' ], -# 'uk' => [ 'fonts-ttf-cyrillic' ], +#'uk_UA' => [ 'fonts-ttf-cyrillic' ], # 'vi' => vietnamese fonts 'yi' => [ 'acon' ], - 'zh_CN' => [ 'rxvt-CLE', 'fonts-ttf-gb2312' ], + 'zh_CN.GB2312' => [ 'rxvt-CLE', 'fonts-ttf-gb2312' ], 'zh_TW.Big5' => [ 'rxvt-CLE', 'fonts-ttf-big5' ], ); |