From: Michael Prokop <mika@grml.org>
Date: Mon, 3 Nov 2008 00:27:53 +0000 (+0100)
Subject: Update locales/language handling
X-Git-Tag: v0.8.15~1
X-Git-Url: https://git.grml.org/?p=grml-autoconfig.git;a=commitdiff_plain;h=9bc079508a6358e38f335657021736f047a9b835;hp=820380832f6d21a9f7c227455df60e07410d3c23

Update locales/language handling
---

diff --git a/autoconfig.functions b/autoconfig.functions
index 0084161..921be17 100755
--- a/autoconfig.functions
+++ b/autoconfig.functions
@@ -204,12 +204,16 @@ config_language(){
 
  # set default to 'en' in live-cd mode if $LANGUAGE is not yet set:
  if [ -z "$INSTALLED" ] ; then
-    [ -n "$LANGUAGE" ] || LANGUAGE='en-utf8'
+    [ -n "$LANGUAGE" ] || LANGUAGE='us'
  fi
 
  # if bootoption lang is used update /etc/default/locale, otherwise *not*!
- if [ -n "$BOOT_LANGUAGE" ] ; then
-    [ -x /usr/sbin/grml-setlang ] && /usr/sbin/grml-setlang "$LANGUAGE"
+ if [ -n "$BOOT_LANGUAGE" -a -x /usr/sbin/grml-setlang ] ; then
+    if checkgrmlsmall ; then
+       /usr/sbin/grml-setlang "POSIX"
+    else
+       /usr/sbin/grml-setlang "$LANGUAGE"
+    fi
  fi
 
  # set console font
diff --git a/debian/changelog b/debian/changelog
index 59ffc83..f8f5abc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+grml-autoconfig (0.8.15) unstable; urgency=low
+
+  * Use us instead of en-utf8 as default locale (this is what we
+    are using as bootparam by default as well).
+  * Support C/POSIX locales within language setup.
+  * Use POSIX locales on grml-small.
+
+ -- Michael Prokop <mika@grml.org>  Mon, 03 Nov 2008 01:26:49 +0100
+
 grml-autoconfig (0.8.14) unstable; urgency=low
 
   * Rework config_swspeak once more, move most parts of the logic
diff --git a/language-functions b/language-functions
index 3a914c2..3c74fa9 100644
--- a/language-functions
+++ b/language-functions
@@ -7,6 +7,10 @@
 
 # The default language/keyboard to use. This CAN NOT be autoprobed.
 case "$LANGUAGE" in
+        C|POSIX)
+                LANG="C"
+                LANGUAGE="C"
+                ;;
         at-iso)
                 # Austrian version
                 COUNTRY="at"