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

diff --git a/usr_sbin/grml-setlang b/usr_sbin/grml-setlang
index 3efda81..f8cb28b 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: Mit Sep 05 18:33:23 CEST 2007 [mika]
 ################################################################################
 
 PN="$(basename $0)"
@@ -40,8 +40,11 @@ fi
 setvalue(){
   [ -n "$2" ] || return 1
   # already present in conffile?
-  if grep -q ${1} $CONFFILE ; then
-     sed -i "s#^${1}.*#${1}${2}#"   $CONFFILE
+  if grep -q "^${1}" "$CONFFILE" ; then
+     sed -i "s#^${1}.*#${1}${2}#"  $CONFFILE
+  # is the new Debian style /etc/default/locale present?
+  elif grep -q "^# ${1}$" "$CONFFILE" ; then
+     sed -i "s#^\# ${1}#${1}${2}#" $CONFFILE
   else
      echo "$1${2}" >> $CONFFILE
   fi
@@ -50,7 +53,7 @@ setvalue(){
 # grml-small does not provide any further locales
 if grep -q small /etc/grml_version 2>/dev/null ; then
    if [ -z "$NONINTERACTIVE" ] ; then
-      $DIALOG --stdout --msgbox "Notice: grml-small does not provide a full language setup.
+      LANG=C $DIALOG --stdout --msgbox "Notice: grml-small does not provide a full language setup.
 
 You have to make sure the appropriate packages are installed." 0 0
       exit 1
@@ -68,14 +71,14 @@ if [ -z "$DEFAULT_LANGUAGE" ] ; then
 fi
 
 if [ -z "$NONINTERACTIVE" ] ; then
-   LANGUAGE=$($DIALOG --stdout --title "$PN" --default-item $DEFAULT_LANGUAGE --radiolist \
+   LANGUAGE=$(LANG=C $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 +162,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 +176,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,13 +188,13 @@ fi
 setvalue 'LANGUAGE='    $LANGUAGE
 setvalue 'LANG='        $LANG
 setvalue 'LC_MESSAGES=' $LANG
-setvalue 'TZ='          $TZ
+# setvalue 'TZ='          $TZ
 
 retval=$?
 case $retval in
     (0)
           if [ -z "$NONINTERACTIVE" ] ; then
-             $DIALOG --stdout --msgbox "Writing language settings ($LANGUAGE) to $CONFFILE was successful." 0 0
+             LANG=C $DIALOG --stdout --msgbox "Writing language settings ($LANGUAGE) to $CONFFILE was successful." 0 0
           else
              einfo "Writing language settings ($LANGUAGE) to $CONFFILE was successful."
              esyslog user.notice "$PN" "Writing language settings ($LANGUAGE) to $CONFFILE was successful." ; eend 0
@@ -199,7 +202,7 @@ case $retval in
           ;;
     *)
           if [ -z "$NONINTERACTIVE" ] ; then
-             $DIALOG --stdout --msgbox "Error writing settings for $LANGUAGE to $CONFFILE." 0 0
+             LANG=C $DIALOG --stdout --msgbox "Error writing settings for $LANGUAGE to $CONFFILE." 0 0
           else
              eerror "Error writing settings for $LANGUAGE to $CONFFILE." ; eend 1
              esyslog user.notice "$PN" "Error writing settings for $LANGUAGE to $CONFFILE."