From 37638eda01ac8743d6dbd85f1d699619571432a0 Mon Sep 17 00:00:00 2001
From: Bill Nottingham <notting@redhat.com>
Date: Wed, 23 Apr 2008 14:07:26 -0400
Subject: There is no more GDM_LANG - handle pre-existing LANG (#372151,
 <rstrode@redhat.com>)

---
 lang.csh | 25 ++++++++++---------------
 1 file changed, 10 insertions(+), 15 deletions(-)

(limited to 'lang.csh')

diff --git a/lang.csh b/lang.csh
index 72f39435..6a4867b7 100755
--- a/lang.csh
+++ b/lang.csh
@@ -3,24 +3,19 @@
 set sourced=0
 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
+    set saved_lang=$LANG
 endif
 
-if ($?GDM_LANG) then
-    set sourced=1
-    setenv LANG $GDM_LANG
-    if ($?LANGUAGE) then
-      unsetenv LANGUAGE
-    endif
-    if ("$GDM_LANG" == "zh_CN.GB18030") then
-      setenv LANGUAGE "zh_CN.GB18030:zh_CN.GB2312:zh_CN"
+foreach file (/etc/sysconfig/i18n $HOME/.i18n)
+    if ( -f $file ) then
+	eval `grep -v '^[:blank:]*#' $file | sed 's|\([^=]*\)=\([^=]*\)|setenv \1 \2|g' | sed 's|$|;|'`
+	set sourced=1
     endif
+end
+
+if ($?saved_lang) then
+    setenv LANG $saved_lang
+    unset saved_lang
 endif
 
 if ($sourced == 1) then
-- 
cgit v1.2.1


From 39d1593aad51817f5b64a9e95f2144dfaa018ebb Mon Sep 17 00:00:00 2001
From: Bill Nottingham <notting@redhat.com>
Date: Tue, 29 Apr 2008 11:48:38 -0400
Subject: Canonicalize the behavior. (#372151)

If no LANG is set, read system and then user configuration.
If an existing one is set (via GDM, ssh, etc.) only read the
user-specific customizations.
---
 lang.csh | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

(limited to 'lang.csh')

diff --git a/lang.csh b/lang.csh
index 6a4867b7..0fd1e498 100755
--- a/lang.csh
+++ b/lang.csh
@@ -1,21 +1,22 @@
 # /etc/profile.d/lang.csh - set i18n stuff
 
 set sourced=0
+
 if ($?LANG) then
-    set sourced=1
     set saved_lang=$LANG
-endif
-
-foreach file (/etc/sysconfig/i18n $HOME/.i18n)
-    if ( -f $file ) then
+    if ( -f $HOME/.i18n ) then
 	eval `grep -v '^[:blank:]*#' $file | sed 's|\([^=]*\)=\([^=]*\)|setenv \1 \2|g' | sed 's|$|;|'`
 	set sourced=1
     endif
-end
-
-if ($?saved_lang) then
     setenv LANG $saved_lang
     unset saved_lang
+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|$|;|'`
+	    set sourced=1
+        endif
+    end
 endif
 
 if ($sourced == 1) then
-- 
cgit v1.2.1


From 52f1914abc03d9d78f13334855d091a192f469bf Mon Sep 17 00:00:00 2001
From: Bill Nottingham <notting@redhat.com>
Date: Fri, 2 May 2008 13:24:20 -0400
Subject: fix syntax error (#444998)

---
 lang.csh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lang.csh')

diff --git a/lang.csh b/lang.csh
index 0fd1e498..40fb0b49 100755
--- a/lang.csh
+++ b/lang.csh
@@ -5,7 +5,7 @@ set sourced=0
 if ($?LANG) then
     set saved_lang=$LANG
     if ( -f $HOME/.i18n ) then
-	eval `grep -v '^[:blank:]*#' $file | sed 's|\([^=]*\)=\([^=]*\)|setenv \1 \2|g' | sed 's|$|;|'`
+	eval `grep -v '^[:blank:]*#' $HOME/.i18n | sed 's|\([^=]*\)=\([^=]*\)|setenv \1 \2|g' | sed 's|$|;|'`
 	set sourced=1
     endif
     setenv LANG $saved_lang
-- 
cgit v1.2.1