if $LANG is set, don't override it (#229102)

2 files changed, 14 insertions, 5 deletions

diff --git a/lang.csh b/lang.csh
index 0327a27a..624a3c68 100755
--- a/lang.csh
+++ b/lang.csh
@@ -1,12 +1,16 @@
 # /etc/profile.d/lang.csh - set i18n stuff
 
 set sourced=0
-foreach file (/etc/sysconfig/i18n $HOME/.i18n)
+if ($?LANG) then
+    set sourced=1
+else
+    foreach file (/etc/sysconfig/i18n $HOME/.i18n)
 	if ( -f $file ) then
 	    eval `grep -v '^[:blank:]*#' $file | sed 's|\([^=]*\)=\([^=]*\)|setenv \1 \2|g' | sed 's|$|;|'`
 	endif
 	set sourced=1
-end
+    end
+endif
 
 if ($?GDM_LANG) then
     set sourced=1
diff --git a/lang.sh b/lang.sh
index 475f3f20..45cb7dfd 100755
--- a/lang.sh
+++ b/lang.sh
@@ -1,9 +1,14 @@
 # /etc/profile.d/lang.sh - set i18n stuff
 
 sourced=0
-for langfile in /etc/sysconfig/i18n $HOME/.i18n ; do
-    [ -f $langfile ] && . $langfile && sourced=1
-done    
+
+if [ -n "$LANG" ]; then
+    sourced=1
+else
+    for langfile in /etc/sysconfig/i18n $HOME/.i18n ; do
+    	[ -f $langfile ] && . $langfile && sourced=1
+    done    
+fi
 
 if [ -n "$GDM_LANG" ]; then
     sourced=1