added AZ keyboard, some more language choices, and fixed some

language->encoding linkings

3 files changed, 44 insertions, 6 deletions

diff --git a/perl-install/keyboard.pm b/perl-install/keyboard.pm
index d2259799d..c032993de 100644
--- a/perl-install/keyboard.pm
+++ b/perl-install/keyboard.pm
@@ -23,6 +23,7 @@ my $KMAP_MAGIC = 0x8B39C07F;
 my %lang2keyboard =
 (
   'af' => 'us_intl',
+  'az' => 'az',
   'be' => 'by',
   'be_BY.CP1251' => 'by',
   'bg' => 'bg',
@@ -48,6 +49,7 @@ my %lang2keyboard =
 'es_MX'=> 'la',
   'et' => 'ee',
   'eu' => 'es',
+  'fa' => 'ir',
   'fi' => 'fi',
   'fr' => 'fr',
 'fr_BE'=> 'be',
@@ -121,6 +123,8 @@ arch() eq "ppc" ? (
  "am_phonetic" => [ __("Armenian (phonetic)"), "am_phonetic", "am(phonetic)" ],
 #- only xmodmap is currently available
 #-"ar" => [ __("Arabic"),        "ar-8859_6",   "ar" ],
+ "az" => [ __("Armenian (latin)"), "az",	"az" ],
+ "a3" => [ __("Armenian (cyrillic)"), "az-koi8c","az(cyrillic)" ],
  "be" => [ __("Belgian"),        "be-latin1",   "be" ],
  "bg" => [ __("Bulgarian"),      "bg",          "bg" ],
  "br" => [ __("Brazilian (ABNT-2)"),      "br-abnt2",    "br" ],
diff --git a/perl-install/lang.pm b/perl-install/lang.pm
index dfb0bf742..3dbbfa8fa 100644
--- a/perl-install/lang.pm
+++ b/perl-install/lang.pm
@@ -21,6 +21,8 @@ my %languages = (
 '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' ],
+  'az'  => [ 'Azeri (latin)',		'iso-8859-9e', 'az', 'az' ],
+  'a3'  => [ 'Azeri (cyrillic)',	'koi8-c',     'a3', 'a3' ],
 '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' ],
@@ -66,9 +68,8 @@ my %languages = (
 #-'lo'  => [ 'Laotian',			'mulelao-1',  'lo', 'lo' ],
   'lt'  => [ 'Lithuanian',		'iso-8859-13','lt', 'lt' ],
   'lv'  => [ 'Latvian',			'iso-8859-13','lv', 'lv' ],   
-#-'mi'	=> [ 'Maori',			'iso-8859-13','mi', 'mi' ],
-#-'mk'  => [ 'Macedonian (Cyrillic)',	'iso-8859-5', 'mk', 'mk:sp:sr' ],
-#-'mk_latin'=> [ 'Macedonian (Latin)',	'iso-8859-2', 'mk_latin', 'mk_latin:sr' ],
+  'mi'	=> [ 'Maori',			'iso-8859-13','mi', 'mi' ],
+  'mk'  => [ 'Macedonian (Cyrillic)',	'iso-8859-5', 'mk', 'mk:sp:sr' ],
 #-'ms'  => [ 'Malay',			'iso-8859-1', 'ms', 'ms' ],
   'nl'  => [ 'Dutch (Netherlands)',	'iso-8859-1', 'nl', 'nl_NL:nl' ],
 # 'nb' is the new locale name in glibc 2.2
@@ -91,9 +92,11 @@ my %languages = (
 'sv@traditionell' => [ 'Swedish (traditional sorting)','iso-8859-1', 'sv', 'sv' ],
 'sv@ny' => [ 'Swedish (new sorting (v diff of w)','iso-8859-1', 'sv', 'sv' ],
 #-'ta'	=> [ 'Tamil',			'tscii-0',    'ta', 'ta' ],
+  'tg'	=> [ 'Tajik',			'koi8-c',     'tg', 'tg' ],
   'th'  => [ 'Thai',                    'tis620',     'th', 'th' ],
   'tr'  => [ 'Turkish',	 		'iso-8859-9', 'tr', 'tr' ],
-#-'ur'	=> [ 'Urdu',			'????',	      'ur', 'ur' ],  
+  'tt'	=> [ 'Tatar',			'tatar-cyr',  'tg', 'tg' ],
+#-'ur'	=> [ 'Urdu',			'cp1256',     'ur', 'ur' ],  
 'uk_UA' => [ 'Ukrainian', 		'koi8-u',     'uk', 'uk_UA:uk' ],
   'vi'  => [ 'Vietnamese (TCVN)',       'tcvn',       'vi',
 					'vi_VN.tcvn:vi_VN.tcvn-5712:vi' ],
@@ -110,22 +113,41 @@ my %xim = (
 	ENC => 'big5',
 	XIM => 'xcin',
 	XMODIFIERS => '"@im=xcin"',
+	CONSOLE_NOT_LOCALIZED => 'yes',
   },
   'zh_CN.GB2312' => {
 	ENC => 'gb',
 	XIM => 'xcin-zh_CN.GB2312',
 	XMODIFIERS => '"@im=xcin-zh_CN.GB2312"',
+	CONSOLE_NOT_LOCALIZED => 'yes',
   },
   'ko' => {
 	ENC => 'kr',
 	XIM => 'Ami',
 	XMODIFIERS => '"@im=Ami"',
+	CONSOLE_NOT_LOCALIZED => 'yes',
   },
   'ja' => {
 	ENC => 'eucj',
 	XIM => 'kinput2',
 	XMODIFIERS => '"@im=kinput2"',
-  }
+  },
+  # right to left languages only work properly on console
+  'ar' => {
+	X11_NOT_LOCALIZED => "yes",
+  },
+  'fa' => {
+	X11_NOT_LOCALIZED => "yes",
+  },
+  'he' => {
+	X11_NOT_LOCALIZED => "yes",
+  },
+  'ur' => {
+	X11_NOT_LOCALIZED => "yes",
+  },
+  'yi' => {
+	X11_NOT_LOCALIZED => "yes",
+  },
 );
 
 sub std2 { "-*-*-medium-r-normal-*-$_[1]-*-*-*-*-*-$_[0]" }
@@ -174,6 +196,8 @@ my %charsets = (
 	std_("iso8859-14") ],
   "iso-8859-15" => [ "lat0-sun16",	undef,		"iso15",
 	std("iso8859-15") ],
+  "iso-8859-9e" => [ "tiso09e",		"iso09",	"trivial.trans",
+	std("iso8859-9e") ],
 #- japanese needs special console driver for text mode [kon2]
   "jisx0208"   => [ undef,		undef,		"trivial.trans",
 	"-*-*-*-*-*-*-*-*-*-*-*-*-jisx*.*-0" ],
@@ -181,12 +205,20 @@ my %charsets = (
 	std("koi8-r") ],
   "koi8-u"     => [ "UniCyr_8x16",	undef,		"koi8-u",
 	std("koi8-u") ],
+  "koi8-c"     => [ "tkoi8c",		"iso01",	"trivial.trans",
+	std("koi8-c") ],
+  "tatar-cyr"  => [ "tcp1251tt",	"iso01",	"trivial.trans",
+	std("tatar-cyr") ],
   "cp1251"     => [ "UniCyr_8x16",	undef,		"cp1251",
 	std("microsoft-cp1251") ],
 #- Yiddish needs special console driver for text mode [acon]
 #- (and gtk support isn't done yet)
   "cp1255"     => [ "iso08.f16",        "iso08",        "trivial.trans",
 	std_("microsoft-cp1255") ],
+#- Urdu needs special console driver for text mode [acon]
+#- (and gtk support isn't done yet)
+  "cp1256"     => [ undef,              undef,          "trivial.trans",
+	std_("microsoft-cp1255") ],
 #- korean needs special console driver for text mode
   "ksc5601"    => [ undef,		undef,		undef,
 	"-*-*-*-*-*-*-*-*-*-*-*-*-ksc5601.1987-*" ],
diff --git a/perl-install/pkgs.pm b/perl-install/pkgs.pm
index 038df5dad..d77093ac9 100644
--- a/perl-install/pkgs.pm
+++ b/perl-install/pkgs.pm
@@ -72,7 +72,8 @@ 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_RU.KOI8-R' => [ 'XFree86-cyrillic-fonts', 'fonts-ttf-cyrillic' ],
+# 'ru'  => [ 'XFree86-cyrillic-fonts', 'fonts-ttf-cyrillic' ],
+  'ru'  => [ 'XFree86-cyrillic-fonts' ],
   'ru_RU.KOI8-R' => [ 'XFree86-cyrillic-fonts' ],
   'sk'	=> [ 'XFree86-ISO8859-2', 'XFree86-ISO8859-2-75dpi-fonts' ],
   'sl'	=> [ 'XFree86-ISO8859-2', 'XFree86-ISO8859-2-75dpi-fonts' ],
@@ -83,6 +84,7 @@ autoirpm autoirpm-icons numlock
 #'uk_UA' => [ 'fonts-ttf-cyrillic' ],
 # 'vi'	=> vietnamese fonts
   'yi'  => [ 'acon' ],
+  'zh'  => [ 'rxvt-CLE', 'taipeifonts', 'fonts-ttf-big5', 'fonts-ttf-gb2312' ],
   'zh_CN.GB2312' => [ 'rxvt-CLE', 'fonts-ttf-gb2312' ],
   'zh_TW.Big5' => [ 'rxvt-CLE', 'taipeifonts', 'fonts-ttf-big5' ],
 );