X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=usr_sbin%2Fgrml-setlang;h=df45be8468f2eca68e2d7435dba224aeaf5fbaf3;hb=b42f83d9c02a4dc3e1d950625b442a98283d25b7;hp=3efda814ae9aa53d2bc19b18e3e207691cc6d7ea;hpb=ebc57739c2ef2fa44f126bc29ccdee7ea025401f;p=grml-scripts.git

diff --git a/usr_sbin/grml-setlang b/usr_sbin/grml-setlang
index 3efda81..df45be8 100755
--- a/usr_sbin/grml-setlang
+++ b/usr_sbin/grml-setlang
@@ -4,7 +4,7 @@
 # Authors:       grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
 # Bug-Reports:   see http://grml.org/bugs/
 # License:       This file is licensed under the GPL v2.
-# Latest change: Sam Dez 16 18:20:42 CET 2006 [mika]
+# Latest change: Sam Apr 28 17:38:28 CEST 2007 [mika]
 ################################################################################
 
 PN="$(basename $0)"
@@ -71,11 +71,11 @@ if [ -z "$NONINTERACTIVE" ] ; then
    LANGUAGE=$($DIALOG --stdout --title "$PN" --default-item $DEFAULT_LANGUAGE --radiolist \
 "Which language do you want to use?
 
-This will affect \$LANG, \$LANGUAGE, \$LC_MESSAGES and \$TZ.
+This will affect \$LANG, \$LANGUAGE and \$LC_MESSAGES.
 
 Notice: if you want to adjust /etc/locale.gen (defines
 which locales should be generated by locale-gen)
-please run 'dpkg-reconfigure locale' manually.
+please run 'dpkg-reconfigure locales' manually.
 
 Configuration will be written to $CONFFILE" 0 0 0 \
  at 'austria (unicode version)' off \
@@ -159,7 +159,7 @@ else # non-interactive
   LANGUAGE="$1"
 fi
 
-if ! grep -q "${LANGUAGE})" $LANGFUNC ; then
+if ! grep -qe "${LANGUAGE})" -qe "${LANGUAGE}|" $LANGFUNC ; then
    ewarn "Language ${LANGUAGE} not supported, using default." ; eend 0
 fi
 
@@ -173,7 +173,7 @@ cat > $CONFFILE <<EOF
 LANGUAGE=$LANGUAGE
 LANG=$LANG
 LC_MESSAGES=$LANG
-TZ=$TZ
+# TZ=$TZ
 # other environment variables you might want to set:
 # LC_CTYPE LC_NUMERIC LC_TIME LC_COLLATE LC_MONETARY
 # LC_MESSAGES LC_PAPER LC_NAME LC_ADDRESS LC_TELEPHONE
@@ -185,7 +185,7 @@ fi
 setvalue 'LANGUAGE='    $LANGUAGE
 setvalue 'LANG='        $LANG
 setvalue 'LC_MESSAGES=' $LANG
-setvalue 'TZ='          $TZ
+# setvalue 'TZ='          $TZ
 
 retval=$?
 case $retval in