X-Git-Url: http://git.grml.org/?p=grml-autoconfig.git;a=blobdiff_plain;f=autoconfig.functions;h=d9c04c8c3859ed6282a237072ab544d05a2975bf;hp=70bb1257e507e1bc8962c33fab9f6b27bdc8937b;hb=836ed246742907a3c931260647d0c6ac5dcb081d;hpb=7d847f9ac4c963e3e6dbb553f95672f13a2a4a3e 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