From 0eb4ec769e0f37b6d0379d3221412c75e78e70b2 Mon Sep 17 00:00:00 2001
From: Pablo Saratxaga <pablo@mandriva.com>
Date: Thu, 20 Jul 2000 17:18:38 +0000
Subject: posibility to choose two different sorting (LC_COLLATE) for
 Norwegian.

---
 perl-install/keyboard.pm |  6 +++++-
 perl-install/lang.pm     | 14 +++++++-------
 2 files changed, 12 insertions(+), 8 deletions(-)

(limited to 'perl-install')

diff --git a/perl-install/keyboard.pm b/perl-install/keyboard.pm
index 0bbafc178..a71a56c75 100644
--- a/perl-install/keyboard.pm
+++ b/perl-install/keyboard.pm
@@ -64,11 +64,13 @@ my %lang2keyboard =
   'it' => 'it',
   'ka' => 'ge_la',
   'lt' => 'lt',
+  'nb' => 'no',
   'nl' => 'nl',
 'nl_BE'=> 'be',
 'nl_NL'=> 'nl',
   'no' => 'no',
   'no@nynorsk' => 'no',
+  'ny' => 'no',
   'oc' => 'fr',
   'pl' => 'pl',
   'pt' => 'pt',
@@ -80,6 +82,8 @@ my %lang2keyboard =
   'sl' => 'si',
   'sr' => 'yu',
   'sv' => 'se',
+  'sv@ny' => 'se',
+  'sv@traditionell' => 'se',
   'th' => 'th',
   'tr' => 'tr_q',
   'uk' => 'ua',
@@ -136,7 +140,7 @@ arch() eq "ppc" ? (
  "il" => [ __("Israeli"),        "il-8859_8",   "il" ],
  "il_phonetic" => [ __("Israeli (Phonetic)"),"hebrew",   "il_phonetic" ],
 #- only xmodmap is currently available
-#"ir" => [ __("Iranian"),      "ir-isiri3342",   "ir" ],
+#"ir" => [ __("Iranian"),        "ir-isiri3342","ir" ],
  "is" => [ __("Icelandic"),      "is-latin1",   "is" ],
  "it" => [ __("Italian"),        "it-latin1",   "it" ],
  "la" => [ __("Latin American"), "la-latin1",   "la" ],
diff --git a/perl-install/lang.pm b/perl-install/lang.pm
index 865480f86..8bd641de9 100644
--- a/perl-install/lang.pm
+++ b/perl-install/lang.pm
@@ -77,7 +77,7 @@ my %languages = (
 'no@nynorsk' => [ 'Norwegian (Nynorsk)','iso-8859-1', 'no', 'no@nynorsk:ny:no_NY:no' ],
 #-'oc'  => [ 'Occitan',			'iso-8859-1', 'oc', 'oc:fr_FR' ],
 #-'pd'	=> [ 'Plauttdietsch',		'iso-8859-1', 'pd', 'pd' ],
-#-'ph'  => [ 'Pilipino',		'iso-8859-1', 'ph', 'ph' ],
+#-'ph'  => [ 'Pilipino',		'iso-8859-1', 'ph', 'ph:tl' ],
   'pl'  => [ 'Polish',			'iso-8859-2', 'pl', 'pl' ],
 #-'pp'	=> [ 'Papiamento',		'iso-8859-1', 'pp', 'pp' ],
 'pt_BR' => [ 'Portuguese (Brazil)',	'iso-8859-1', 'pt_BR', 'pt_BR:pt_PT:pt' ],
@@ -88,10 +88,12 @@ my %languages = (
   'sl'  => [ 'Slovenian',		'iso-8859-2', 'sl', 'sl' ],
   'sp'  => [ 'Serbian (Cyrillic)',	'iso-8859-5', 'sp', 'sp:sr' ],
   'sr'  => [ 'Serbian (Latin)',		'iso-8859-2', 'sr', 'sr' ],
-  'sv'  => [ 'Swedish',			'iso-8859-1', 'sv', 'sv' ],
-  'ta'	=> [ 'Tamil',			'tscii-0',    'ta', 'ta' ],
+'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' ],
   'th'  => [ 'Thai',                    'tis620',     'th', 'th' ],
   'tr'  => [ 'Turkish',	 		'iso-8859-9', 'tr', 'tr' ],
+#-'ur'	=> [ 'Urdu',			'????',	      'ur', 'ur' ],  
 'uk_UA' => [ 'Ukrainian', 		'koi8-u',     'uk', 'uk_UA:uk' ],
   'vi'  => [ 'Vietnamese (TCVN)',       'tcvn',       'vi',
 					'vi_VN.tcvn:vi_VN.tcvn-5712:vi' ],
@@ -240,8 +242,6 @@ sub set {
 	$ENV{LC_ALL}    = $lang;
 	$ENV{LANG}      = $languages{$lang}[2];
 	$ENV{LANGUAGE}  = $languages{$lang}[3];
-#- apparently autoconf/automake doesn't like LINGUAS having a list of values
-#-	$ENV{LINGUAS}   = $languages{$lang}[3];
     } else {
 	# stick with the default (English) */
 	delete $ENV{LANG};
@@ -266,8 +266,8 @@ sub write {
 
     $lang or return;
 
-    my $h = { LC_CTYPE => $lang };
-    add2hash $h, { LC_COLLATE => $lang };
+    my $h = { LC_COLLATE => $lang };
+    add2hash $h, { LC_CTYPE => $lang };
     add2hash $h, { LC_MESSAGES => $lang };
     add2hash $h, { LC_NUMERIC => $lang };
     add2hash $h, { LC_MONETARY => $lang };
-- 
cgit v1.2.1