From: Markus Ulrich <markus@bionix-it.de>
Date: Thu, 17 May 2012 00:32:13 +0000 (+0200)
Subject: Remove standard language settings for grml_small (type: POSIX)
X-Git-Tag: v0.9.51~3
X-Git-Url: https://git.grml.org/?p=grml-autoconfig.git;a=commitdiff_plain;h=836ed246742907a3c931260647d0c6ac5dcb081d;ds=sidebyside

Remove standard language settings for grml_small (type: POSIX)

Change default language function to exporting the language from
quickconfig or bootoption or set language to 'en'.
Drop the checkgrmlsmall check in the language config functions.
---

diff --git a/autoconfig.functions b/autoconfig.functions
index 70bb125..d9c04c8 100755
--- a/autoconfig.functions
+++ b/autoconfig.functions
@@ -226,10 +226,10 @@ config_language(){
  if [ -x /usr/sbin/grml-setlang ] ; then
    # if bootoption lang is used update /etc/default/locale accordingly
    if [ -n "$BOOT_LANGUAGE" ] ; then
-     checkgrmlsmall && /usr/sbin/grml-setlang "POSIX" || /usr/sbin/grml-setlang "$LANGUAGE"
+     /usr/sbin/grml-setlang "$LANGUAGE"
    # otherwise default to lang=en
    else
-     checkgrmlsmall && /usr/sbin/grml-setlang "POSIX" || /usr/sbin/grml-setlang "en"
+     /usr/sbin/grml-setlang "en"
    fi
  fi
 
@@ -248,12 +248,8 @@ config_language(){
  fi
 
  # export it now, so error messages get translated, too
- if checkgrmlsmall ; then
-    export LANG='C' # grml-small does not provide any further locales
- else
-    [ -r /etc/default/locale ] && . /etc/default/locale
-    export LANG LANGUAGE
- fi
+ [ -r /etc/default/locale ] && . /etc/default/locale
+ export LANG LANGUAGE
 
  # configure keyboard layout, read in already set values first:
  [ -r /etc/sysconfig/keyboard ] && . /etc/sysconfig/keyboard