From 96df26b3c72f48ddcd5ac906520ae3ec80fe38f6 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Wed, 27 Feb 2002 10:39:40 +0000
Subject: - %lang2country is the authority, so if the country given by
 %lang2country doesn't exist in KDE, return C - fix be,sp,sr

---
 perl-install/lang.pm | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'perl-install/lang.pm')

diff --git a/perl-install/lang.pm b/perl-install/lang.pm
index ae361062f..05b70d665 100644
--- a/perl-install/lang.pm
+++ b/perl-install/lang.pm
@@ -410,6 +410,7 @@ my %charset2kde_charset = (
 #- for special cases not handled magically
 my %lang2country = (
   ar => 'eg',
+  be => 'by',
   bs => 'bh',
   cs => 'cz',
   da => 'dk',
@@ -420,8 +421,7 @@ my %lang2country = (
   ms => 'my',
   nn => 'no',
   sl => 'si',
-  sp => 'yu',
-  sr => 'yu',
+  sp => 'sr',
   sv => 'se',
 );
 
@@ -458,7 +458,9 @@ sub lang2country {
     };
 
     my $country;
-    $country ||= $valid_country->($lang2country{$lang});
+    if ($country ||= $lang2country{$lang}) {
+	return $valid_country->($country) ? $country : 'C';
+    }
     $country ||= $valid_country->(lc($1)) if $lang =~ /([A-Z]+)/;
     $country ||= $valid_country->(lc($1)) if lang2LANGUAGE($lang) =~ /([A-Z]+)/;
     $country ||= $valid_country->(substr($lang, 0, 2));
-- 
cgit v1.2.1