From: Michael Prokop <mika@grml.org>
Date: Sat, 14 Nov 2009 12:25:11 +0000 (+0100)
Subject: Use lang=en as default (instead of lang=us).
X-Git-Tag: v0.9.1~1
X-Git-Url: http://git.grml.org/?p=grml-autoconfig.git;a=commitdiff_plain;h=2e0338e5b686bfaaecd58d257f590042fdb09b21

Use lang=en as default (instead of lang=us).
---

diff --git a/autoconfig.functions b/autoconfig.functions
index 75060f8..637f238 100755
--- a/autoconfig.functions
+++ b/autoconfig.functions
@@ -219,7 +219,7 @@ config_language(){
 
  # set default to 'en' in live-cd mode if $LANGUAGE is not yet set:
  if [ -z "$INSTALLED" ] ; then
-    [ -n "$LANGUAGE" ] || LANGUAGE='us'
+    [ -n "$LANGUAGE" ] || LANGUAGE='en'
  fi
 
  # if bootoption lang is used update /etc/default/locale, otherwise *not*!
diff --git a/debian/changelog b/debian/changelog
index 507f252..ee9131c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+grml-autoconfig (0.9.1) unstable; urgency=low
+
+  * Use lang=en as default (instead of lang=us). [Closes: issue760]
+
+ -- Michael Prokop <mika@grml.org>  Sat, 14 Nov 2009 13:24:19 +0100
+
 grml-autoconfig (0.9.0) unstable; urgency=low
 
   * Drop usage of $UID in scripts.