diff options
Diffstat (limited to 'perl-install')
| -rw-r--r-- | perl-install/keyboard.pm | 4 | ||||
| -rw-r--r-- | perl-install/lang.pm | 20 |
2 files changed, 14 insertions, 10 deletions
diff --git a/perl-install/keyboard.pm b/perl-install/keyboard.pm index db4c09297..894adf130 100644 --- a/perl-install/keyboard.pm +++ b/perl-install/keyboard.pm @@ -24,7 +24,9 @@ my %lang2keyboard = ( 'af' => 'us_intl', 'be' => 'by', + 'be_BY.CP1251' => 'by', 'bg' => 'bg', +'bg_BG'=> 'bg', 'br' => 'fr', 'ca' => 'es', 'cs' => 'cz', @@ -73,6 +75,7 @@ my %lang2keyboard = 'pt_BR'=> 'br', 'pt_PT'=> 'pt', 'ru' => 'ru', + 'ru_RU.KOI8-R' => 'ru', 'sk' => 'sk', 'sl' => 'si', 'sr' => 'yu', @@ -80,6 +83,7 @@ my %lang2keyboard = 'th' => 'th', 'tr' => 'tr_q', 'uk' => 'ua', +'uk_UA' => 'ua', 'wa' => 'be', ); diff --git a/perl-install/lang.pm b/perl-install/lang.pm index 9b6639dcb..f37f8389e 100644 --- a/perl-install/lang.pm +++ b/perl-install/lang.pm @@ -17,13 +17,13 @@ use log; #- [2] = value for $LANG, [3] = value for LANGUAGE (a list of possible #- languages, carefully choosen) my %languages = ( - 'en' => [ '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' => [ 'Belarussian', 'cp1251', 'be', 'be:be_BY.CP1251' ], +'be_BY.CP1251' => [ 'Belarussian', 'cp1251', 'be', 'be:be_BY.CP1251' ], #- provide aliases for some not very standard names used in po files... - 'bg' => [ 'Bulgarian', 'cp1251', 'bg', 'bg:bg.CP1251:bg_BG.CP1251' ], +'bg_BG' => [ 'Bulgarian', 'cp1251', 'bg', 'bg:bg.CP1251:bg_BG.CP1251' ], 'br' => [ 'Brezhoneg', 'iso-8859-1', 'br', 'br:fr_FR:fr' ], 'ca' => [ 'Catalan', 'iso-8859-1', 'ca', 'ca:es_ES:es:fr_FR:fr' ], 'cs' => [ 'Czech', 'iso-8859-2', 'cs', 'cs' ], @@ -34,12 +34,12 @@ my %languages = ( 'el' => [ 'Greek', 'iso-8859-7', 'el', 'el' ], 'eo' => [ 'Esperanto', 'iso-8859-3', 'eo', 'eo' ], 'es_AR' => [ 'Spanish (Argentina)', 'iso-8859-1', 'es', 'es_AR:es_UY:es:es_ES' ], -'es_ES' => [ 'Spanish (Spain, modern sorting)', 'iso-8859-1', 'es', 'es' ], +'es_ES' => [ 'Spanish (Spain, modern sorting)', 'iso-8859-1', 'es', 'es_ES:es' ], 'es@tradicional' => [ 'Spanish (Spain, traditional sorting)', 'iso-8859-1', 'es', 'es' ], 'es_MX' => [ 'Spanish (Mexico)', 'iso-8859-1', 'es', 'es_MX:es:es_ES' ], 'et' => [ 'Estonian', 'iso-8859-15','et', 'et' ], 'eu' => [ 'Euskara (Basque)', 'iso-8859-1', 'eu', 'eu:es_ES:fr_FR:es:fr' ], -#-'fa' => [ 'Farsi (Iranian)', 'isiri-3342', 'fa', 'fa' ], + 'fa' => [ 'Farsi (Iranian)', 'isiri-3342', 'fa', 'fa' ], 'fi' => [ 'Suomi (Finnish)', 'iso-8859-15', 'fi', 'fi' ], #-'fo' => [ 'Faroese', 'iso-8859-1', 'fo', 'fo:??:??' ], 'fr_CA' => [ 'French (Canada)', 'iso-8859-1', 'fr', 'fr_CA:fr' ], @@ -79,7 +79,7 @@ my %languages = ( 'pt_BR' => [ 'Portuguese (Brazil)', 'iso-8859-1', 'pt_BR', 'pt_BR:pt_PT:pt' ], 'pt_PT' => [ 'Portuguese (Portugal)', 'iso-8859-1', 'pt', 'pt_PT:pt:pt_BR' ], 'ro' => [ 'Romanian', 'iso-8859-2', 'ro', 'ro' ], - 'ru' => [ 'Russian', 'koi8-r', 'ru', 'ru' ], +'ru_RU.KOI8-R' => [ 'Russian', 'koi8-r', 'ru', 'ru_RU.KOI8-R:ru' ], 'sk' => [ 'Slovak', 'iso-8859-2', 'sk', 'sk' ], 'sl' => [ 'Slovenian', 'iso-8859-2', 'sl', 'sl' ], 'sp' => [ 'Serbian (Cyrillic)', 'iso-8859-5', 'sp', 'sp:sr' ], @@ -87,7 +87,7 @@ my %languages = ( 'sv' => [ 'Swedish', 'iso-8859-1', 'sv', 'sv' ], 'th' => [ 'Thai', 'tis620', 'th', 'th' ], 'tr' => [ 'Turkish', 'iso-8859-9', 'tr', 'tr' ], - 'uk' => [ 'Ukrainian', 'koi8-u', 'uk', 'uk' ], +'uk_UA' => [ 'Ukrainian', 'koi8-u', 'uk', 'uk_UA:uk' ], 'vi' => [ 'Vietnamese (TCVN)', 'tcvn', 'vi', 'vi_VN.tcvn:vi_VN.tcvn-5712:vi' ], 'vi_VN.viscii' => [ 'Vietnamese (VISCII)','viscii', 'vi', @@ -170,11 +170,11 @@ my %charsets = ( #- japanese needs special console driver for text mode [kon2] "jisx0208" => [ undef, undef, "trivial.trans", "-*-*-*-*-*-*-*-*-*-*-*-*-jisx*.*-0" ], - "koi8-r" => [ "koi8-8x16", "koi8-r", "trivial.trans", + "koi8-r" => [ "UniCyr_8x16", undef, "koi8-r", std("koi8-r") ], - "koi8-u" => [ "koi8u_8x16", "koi8-r", "trivial.trans", + "koi8-u" => [ "UniCyr_8x16", undef, "koi8-u", std("koi8-u") ], - "cp1251" => [ "iso05.f16", "iso05", "iso05_to_cp1251.trans", + "cp1251" => [ "UniCyr_8x16", undef, "cp1251", std("microsoft-cp1251") ], #- Yiddish needs special console driver for text mode [acon] #- (and gtk support isn't done yet) |