From: Michael Prokop <mika@grml.org>
Date: Mon, 20 Nov 2006 23:17:16 +0000 (+0100)
Subject: Use LANGUAGE="en" instead of LANGUAGE="us" for lang=en*,
X-Git-Tag: 0.5-27
X-Git-Url: https://git.grml.org/?p=grml-autoconfig.git;a=commitdiff_plain;h=refs%2Ftags%2F0.5-27

Use LANGUAGE="en" instead of LANGUAGE="us" for lang=en*,
thanks for input - Dirk Deimeke!
---

diff --git a/debian/changelog b/debian/changelog
index 0fca2b6..d4dc0c2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+grml-autoconfig (0.5-27) unstable; urgency=low
+
+  * Use LANGUAGE="en" instead of LANGUAGE="us" for lang=en*,
+    thanks for input - Dirk Deimeke!
+
+ -- Michael Prokop <mika@grml.org>  Tue, 21 Nov 2006 00:04:20 +0100
+
 grml-autoconfig (0.5-26) unstable; urgency=low
 
   * autoconfig.functions: make sure we can access /proc/cmdline
diff --git a/language-functions b/language-functions
index 34a6d45..fde4c96 100644
--- a/language-functions
+++ b/language-functions
@@ -282,7 +282,8 @@ case "$LANGUAGE" in
                 ;;
         en)
                 # English in Austria [see us + uk for american and english version!]
-                LANGUAGE="us"
+                # LANGUAGE="en_US:en_GB:en"
+                LANGUAGE="en"
                 COUNTRY="at"
                 LANG="en_US.iso885915"
                 KEYTABLE="us"
@@ -294,7 +295,7 @@ case "$LANGUAGE" in
                 ;;
         en-utf8)
                 # English in Austria [see us + uk for american and english version!] (UTF8)
-                LANGUAGE="us"
+                LANGUAGE="en"
                 COUNTRY="at"
                 LANG="en_US.UTF-8"
                 KEYTABLE="us"