Skip to content

Commit

Permalink
Remove standard language settings for grml_small (type: POSIX)
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
Markus Ulrich authored and mika committed May 17, 2012
1 parent 7d847f9 commit 836ed24
Showing 1 changed file with 4 additions and 8 deletions.
12 changes: 4 additions & 8 deletions autoconfig.functions
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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
Expand Down

0 comments on commit 836ed24

Please sign in to comment.