don't turn locale settings of 'C' into en_US

2 files changed, 2 insertions, 9 deletions

diff --git a/lang.csh b/lang.csh
index 654ec934..b644c16c 100755
--- a/lang.csh
+++ b/lang.csh
@@ -3,7 +3,7 @@
 set sourced=0
 foreach file (/etc/sysconfig/i18n $HOME/.i18n)
 	if ( -f $file ) then
-	    eval `sed 's|=C$|=en_US|g' $file | sed 's|\([^=]*\)=\([^=]*\)|setenv \1 \2|g' | sed 's|$|;|' `
+	    eval `sed 's|\([^=]*\)=\([^=]*\)|setenv \1 \2|g' $file | sed 's|$|;|' `
 	endif
 	set sourced=1
 end
diff --git a/lang.sh b/lang.sh
index 416f6e8b..e255968b 100755
--- a/lang.sh
+++ b/lang.sh
@@ -6,12 +6,7 @@ for langfile in /etc/sysconfig/i18n $HOME/.i18n ; do
 done    
 
 if [ "$sourced" = 1 ]; then
-    if [ -n "$LANG" ] ; then
-       [ "$LANG" = "C" ] && LANG="en_US"
-       export LANG
-    else
-      unset LANG
-    fi
+    [ -n "$LANG" ] && export LANG || unset LANG
     [ -n "$LC_CTYPE" ] && export LC_CTYPE || unset LC_CTYPE
     [ -n "$LC_COLLATE" ] && export LC_COLLATE || unset LC_COLLATE
     [ -n "$LC_MESSAGES" ] && export LC_MESSAGES || unset LC_MESSAGES
@@ -20,7 +15,6 @@ if [ "$sourced" = 1 ]; then
     [ -n "$LC_TIME" ] && export LC_TIME || unset LC_TIME
     if [ -n "$LC_ALL" ]; then
        if [ "$LC_ALL" != "$LANG" ]; then
-         [ "$LC_ALL" = "C" ] && LC_ALL="en_US"
          export LC_ALL
        else
          unset LC_ALL
@@ -31,7 +25,6 @@ if [ "$sourced" = 1 ]; then
     [ -n "$LANGUAGE" ] && export LANGUAGE || unset LANGUAGE
     if [ -n "$LINGUAS" ]; then
        if [ "$LINGUAS" != "$LANG" ]; then
-          [ "$LINGUAS" = "C" ] && LINGUAS="en_US"
           export LINGUAS
        else
           unset LINGUAS