Author: kmachalkova Date: Wed Jun 20 16:11:24 2007 New Revision: 38928 URL: http://svn.opensuse.org/viewcvs/yast?rev=38928&view=rev Log: A better fix for #285178: do not modify POSIX and C LANG, always append UTF-8 to LC_CTYPE, do this also for /dev/console (not only for xterm & friends) Modified: trunk/yast2/scripts/yast2 Modified: trunk/yast2/scripts/yast2 URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/scripts/yast2?rev=38928&r1=38927&r2=38928&view=diff ============================================================================== --- trunk/yast2/scripts/yast2 (original) +++ trunk/yast2/scripts/yast2 Wed Jun 20 16:11:24 2007 @@ -244,8 +244,12 @@ ;; *) # get rid of encoding and/or modifier - export LANG=${LANG%%[.@]*}.UTF-8 - export LC_CTYPE=${LANG%%[.@]*}.UTF-8 + # but not for POSIX and C locale + # (POSIX.UTF-8 doesn't make sense) + if [ "$LANG" != "POSIX" ] && [ $LANG != "C" ]; then + export LANG=${LANG%%[.@]*}.UTF-8 + fi + export LC_CTYPE=${LC_CTYPE%%[.@]*}.UTF-8 ;; esac if /bin/testutf8 ; [ $? -eq 1 ] ; then @@ -275,8 +279,8 @@ #do not append .UTF-8 suffix to POSIX and C locale (#285178) if [ "$LANG" != "POSIX" ] && [ $LANG != "C" ]; then /usr/bin/test -n "$LANG" && LANG=${LANG%%[.@]*}.UTF-8 - /usr/bin/test -n "$LC_CTYPE" && LC_CTYPE=${LC_CTYPE%%[.@]*}.UTF-8 fi + /usr/bin/test -n "$LC_CTYPE" && LC_CTYPE=${LC_CTYPE%%[.@]*}.UTF-8 fi #default: do nothing, keep locale untouched ;; -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org