Bug#315929: Patch for the wrong locale selection screen when switching languages

[Christian Perrier <bubulle@debian.org>]

tags 315929 patch pending
thanks

It seems that this bug is due to some variables being set only when
they are empty in the languagemap script.

(languagemap is run to fill several locales from the languagelist file
after setting LANGNAME to the English language name)

Always setting these variables solves the reported problem and is very
likely to fix a similar problem in Ubuntu.


-- 



--- languagemap.old	2005-09-17 08:50:27.086421120 +0200
+++ languagemap	2005-09-17 08:50:12.993273574 +0200
@@ -25,17 +25,11 @@
 
     #echo "C: $*"
 
-    if [ "$3" ] ; then 
-      if [ -z "$LOCALE" ] ; then LOCALE="$3" ; fi
-    fi
-    if [ "$4" ] ; then 
-      if [ -z "$FALLBACKLOCALE" ] ; then FALLBACKLOCALE="$4" ; fi
-    fi
-    if [ "$5" ] ; then 
-      if [ -z "$LANGUAGE" ] ; then LANGUAGE="$5" ; fi
-    fi
+    if [ "$3" ] ; then LOCALE="$3" ; fi
+    if [ "$4" ] ; then FALLBACKLOCALE="$4" ; fi
+    if [ "$5" ] ; then LANGUAGE="$5" ; fi
     if [ "$6" ] ; then 
-      if [ -z "$COUNTRY" ] ; then COUNTRY="$6" ;  fi
+      COUNTRY="$6"
     else
       COUNTRY=US
     fi