* Set language using debian-installer/language= rather than locale= if it

does not need an explicit country specification (LP: #85162).

common.inc

@@ -368,7 +368,13 @@
 
     config.lang {
       config.lang "en" ne {
-        config.lang lang.getlocale "locale=%s " bc.cmd dup length add sprintf
+        config.lang
+        config.lang "_" strstr 0 eq {
+          "debian-installer/language=%s "
+        } {
+          "locale=%s "
+        } ifelse
+        bc.cmd dup length add sprintf
       } if
     } if
 

debian/changelog

@@ -1,3 +1,10 @@
+gfxboot-theme-ubuntu (0.5.16) UNRELEASED; urgency=low
+
+  * Set language using debian-installer/language= rather than locale= if it
+    does not need an explicit country specification (LP: #85162).
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Sun, 06 Apr 2008 13:57:09 +0100
+
 gfxboot-theme-ubuntu (0.5.15) hardy; urgency=low
 
   * Rebuild font based on debian-installer 20070308ubuntu35.