if LC_ALL/LINGUAS == LANG, don't set them

2 files changed, 18 insertions, 4 deletions

diff --git a/lang.csh b/lang.csh
index 720e9be8..baa504a2 100755
--- a/lang.csh
+++ b/lang.csh
@@ -3,6 +3,12 @@
 test -f /etc/sysconfig/i18n
 if ($status == 0) then
     eval `sed 's|=C$|=en_US|g' /etc/sysconfig/i18n | sed 's|\([^=]*\)=\([^=]*\)|setenv \1 \2|g' | sed 's|$|;|' `
+    if ($LC_ALL == $LANG) then
+       unsetenv LC_ALL
+    endif
+    if ($LINGUAS == $LANG) then
+       unsetenv LINGUAS
+    endif
 
     if ($?SYSFONTACM) then
         switch ($SYSFONTACM)
diff --git a/lang.sh b/lang.sh
index 8dc85e01..ad8370da 100755
--- a/lang.sh
+++ b/lang.sh
@@ -15,15 +15,23 @@ if [ -f /etc/sysconfig/i18n ]; then
     [ -n "$LC_MONETARY" ] && export LC_MONETARY || unset LC_MONETARY
     [ -n "$LC_TIME" ] && export LC_TIME || unset LC_TIME
     if [ -n "$LC_ALL" ]; then
-       [ "$LC_ALL" = "C" ] && LC_ALL="en_US"
-       export LC_ALL
+       if [ "$LC_ALL" != "$LANG" ]; then
+         [ "$LC_ALL" = "C" ] && LC_ALL="en_US"
+         export LC_ALL
+       else
+         unset LC_ALL
+       fi
     else
        unset LC_ALL
     fi
     [ -n "$LANGUAGE" ] && export LANGUAGE || unset LANGUAGE
     if [ -n "$LINGUAS" ]; then
-       [ "$LINGUAS" = "C" ] && LINGUAS="en_US"
-       export LINGUAS
+       if [ "$LINGUAS" != "$LANG" ]; then
+          [ "$LINGUAS" = "C" ] && LINGUAS="en_US"
+          export LINGUAS
+       else
+          unset LINGUAS
+       fi
     else 
        unset LINGUAS
     fi