Author: kmachalkova Date: Tue Jun 19 14:14:16 2007 New Revision: 38518 URL: http://svn.opensuse.org/viewcvs/yast?rev=38518&view=rev Log: - Respect user's choice and never unset LANG (yast2-funcs) - Do not append .UTF-8 suffix to POSIX and C locale (/sbin/yast2) Modified: trunk/yast2/scripts/yast2 trunk/yast2/scripts/yast2-funcs Modified: trunk/yast2/scripts/yast2 URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/scripts/yast2?rev=38518&r1=38517&r2=38518&view=diff ============================================================================== --- trunk/yast2/scripts/yast2 (original) +++ trunk/yast2/scripts/yast2 Tue Jun 19 14:14:16 2007 @@ -271,9 +271,12 @@ /usr/bin/test -n "$LC_CTYPE" && LC_CTYPE=${LC_CTYPE%.UTF-8} # the terminal supports utf8 and it is currently set # so strip any possible suffix from locale and append .UTF-8 - elif [ "$UTF8TESTED" == "1" ] && [ $UTF8STATUS -eq 2 ]; then - /usr/bin/test -n "$LANG" && LANG=${LANG%%[.@]*}.UTF-8 - /usr/bin/test -n "$LC_CTYPE" && LC_CTYPE=${LC_CTYPE%%[.@]*}.UTF-8 + elif [ "$UTF8TESTED" == "1" ] && [ $UTF8STATUS -eq 2 ]; then + #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 fi #default: do nothing, keep locale untouched ;; Modified: trunk/yast2/scripts/yast2-funcs URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/scripts/yast2-funcs?rev=38518&r1=38517&r2=38518&view=diff ============================================================================== --- trunk/yast2/scripts/yast2-funcs (original) +++ trunk/yast2/scripts/yast2-funcs Tue Jun 19 14:14:16 2007 @@ -81,12 +81,12 @@ # function set_lang_from_sysconfig() { - # if LANG is "POSIX", unset LANG - # SL 9.3 had default LANG set to "" - # SL 10.0 has default LANG set to "POSIX" - if [ "$LANG" == "POSIX" ] ; then - LANG="" - fi + # respect user's choice and never unset LANG + # /sbin/yast script takes care that .UTF-8 suffix + # will not be appended to POSIX and C locale (#285178) + #if [ "$LANG" == "POSIX" ] ; then + # LANG="" + #fi # if LANG is not empty and /etc/sysconfig/language exists if [ -z "$LANG" -a -r /etc/sysconfig/language ] ; then -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org