Adjust locale handling (LANG/LANGUAGE) to match with Debian wheezy defaults

Fixes #25

diff --git a/chroot-script b/chroot-script
index dc895cb..3a8dca9 100755 (executable)
--- a/chroot-script
+++ b/chroot-script
@@ -423,7 +423,7 @@ default_locales() {
       return 0
     fi
 
-    /usr/sbin/update-locale LANG="$DEFAULT_LOCALES"
+    /usr/sbin/update-locale LANGUAGE="$DEFAULT_LANGUAGE" LANG="$DEFAULT_LOCALES"
   fi
 }
 # }}}

diff --git a/config b/config
index 610dd4a..7af583f 100644 (file)
--- a/config
+++ b/config
@@ -175,10 +175,14 @@
 # Default: 'yes'
 # LOCALES='no'
 
-# locales that should be used as default.
+# locales (LANG) that should be used as default.
 # Default: 'en_US.UTF-8'
 # DEFAULT_LOCALES='en_US.UTF-8'
 
+# locales (LANGUAGE) that should be used as default.
+# Default: 'en_US:en'
+# DEFAULT_LANGUAGE='en_US:en'
+
 # Use /usr/share/zoneinfo/$TIMEZONE for /etc/localtime.
 # Default: 'Europe/Vienna'
 # TIMEZONE='Europe/Vienna'

diff --git a/grml-debootstrap b/grml-debootstrap
index 3e77319..0d10ca0 100755 (executable)
--- a/grml-debootstrap
+++ b/grml-debootstrap
@@ -19,6 +19,7 @@ MNTPOINT="/mnt/debootstrap.$$"
 [ -n "$DEBIAN_FRONTEND" ] || DEBIAN_FRONTEND='noninteractive'
 [ -n "$DEBOOTSTRAP" ] || DEBOOTSTRAP='debootstrap'
 [ -n "$DEFAULT_LOCALES" ] || DEFAULT_LOCALES='en_US.UTF-8'
+[ -n "$DEFAULT_LANGUAGE" ] || DEFAULT_LANGUAGE='en_US:en'
 [ -n "$EXTRAPACKAGES" ] || EXTRAPACKAGES='yes'
 [ -n "$FALLBACK_MIRROR" ] || FALLBACK_MIRROR='http://http.debian.net/debian'
 [ -n "$FORCE" ] || FORCE=''
@@ -1153,6 +1154,7 @@ preparechroot() {
   [ -n "$DEBIAN_FRONTEND" ]     && echo "DEBIAN_FRONTEND=\"$DEBIAN_FRONTEND\""         >> $CHROOT_VARIABLES
   [ -n "$DEBOOTSTRAP" ]         && echo "DEBOOTSTRAP=\"$DEBOOTSTRAP\""                 >> $CHROOT_VARIABLES
   [ -n "$DEFAULT_LOCALES" ]     && echo "DEFAULT_LOCALES=\"$DEFAULT_LOCALES\""         >> $CHROOT_VARIABLES
+  [ -n "$DEFAULT_LANGUAGE" ]    && echo "DEFAULT_LANGUAGE=\"$DEFAULT_LANGUAGE\""       >> $CHROOT_VARIABLES
   [ -n "$EXTRAPACKAGES" ]       && echo "EXTRAPACKAGES=\"$EXTRAPACKAGES\""             >> $CHROOT_VARIABLES
   [ -n "$FALLBACK_MIRROR" ]     && echo "FALLBACK_MIRROR=\"$FALLBACK_MIRROR\""         >> $CHROOT_VARIABLES
   [ -n "$FORCE" ]               && echo "FORCE=\"$FORCE\""                             >> $CHROOT_VARIABLES

diff --git a/locale.gen b/locale.gen
index ed743f6..e9f28ba 100644 (file)
--- a/locale.gen
+++ b/locale.gen
@@ -1,9 +1,6 @@
 # This file lists locales that you wish to have built. You can find a list
-# of valid supported locales at /usr/share/i18n/SUPPORTED. Other
-# combinations are possible, but may not be well tested. If you change
+# of valid supported locales at /usr/share/i18n/SUPPORTED, and you can add
+# user defined locales to /usr/local/share/i18n/SUPPORTED. If you change
 # this file, you need to rerun locale-gen.
-#
 
-en_US ISO-8859-1
-en_US.ISO-8859-15 ISO-8859-15
 en_US.UTF-8 UTF-8