* Pass any country code found in ll_CC form in the "lang" file through to

Linux. Make sure to strip off the country internally when required.

common.inc

@@ -1077,12 +1077,6 @@
       over exch 0 exch put
       1 add
     } forall
-    true lang.defaultnames {
-      .la.language get tmp eq { pop false exit } if
-    } forall {
-      % If we don't know about this locale, then try the short locale name.
-      tmp 2 0 put
-    } if
     tmp dup setlang pop setkeymap
   } {
     pop

debian/changelog

@@ -1,6 +1,8 @@
 gfxboot-theme-ubuntu (0.3.0) UNRELEASED; urgency=low
 
   * Add Swiss French keymap (closes: Malone #67355).
+  * Pass any country code found in ll_CC form in the "lang" file through to
+    Linux. Make sure to strip off the country internally when required.
 
  -- Colin Watson <cjwatson@ubuntu.com>  Sun, 29 Oct 2006 21:11:47 +0000
 

dia_lang.inc

@@ -129,12 +129,34 @@
 
   % start with current lang
 
+  /la.tmp.found false def
+
   /la.tmp.cnt 0 def
   lang.items {
-    config.lang eq { xmenu .xm_current la.tmp.cnt put exit } if
+    config.lang eq {
+      xmenu .xm_current la.tmp.cnt put /la.tmp.found true def exit
+    } if
     /la.tmp.cnt inc
   } forall
 
+  la.tmp.found not {
+    % Try without the country code.
+    config.lang "_" strstr dup 0 ne {
+      1 sub
+      config.lang strdup dup rot 0 put
+      /la.tmp.cnt 0 def
+      lang.items {
+        over eq {
+          xmenu .xm_current la.tmp.cnt put exit
+        } if
+        /la.tmp.cnt inc
+      } forall
+      free
+    } {
+      pop
+    } ifelse
+  } if
+
   pmenu.init
 } def
 

help.inc

@@ -697,6 +697,11 @@ clip.size pop 800 eq {
       help.file free /help.file .undef def
       16 string dup config.lang "%s.hlp" 2 index sprintf
       findfile exch free
+      dup .undef eq {
+        pop 16 string
+        dup config.lang 1 get config.lang 0 get "%c%c.hlp" 3 index sprintf
+        findfile exch free
+      } if
       dup .undef eq { pop "en.hlp" findfile } if
       dup .undef eq { pop "" } if
       /help.file over def

locale.inc

@@ -90,11 +90,6 @@
     config.lang length 2 gt {
       pop 16 string
       dup config.lang 1 get config.lang 0 get "%c%c.tr" 3 index sprintf findfile exch free
-      dup {
-        /config.lang 2 string
-          config.lang 1 get config.lang 0 get "%c%c" 3 index sprintf
-        def
-      } if
     } if
   } if
   dup .undef eq { pop "en.tr" findfile } if