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.sh | 21 +++++++--------------
 1 file changed, 7 insertions(+), 14 deletions(-)

(limited to 'lang.sh')

diff --git a/lang.sh b/lang.sh
index 62364d06..705e7a58 100755
--- a/lang.sh
+++ b/lang.sh
@@ -2,22 +2,15 @@
 
 sourced=0
 
-if [ -n "$LANG" ]; then
-    sourced=1
-else
-    for langfile in /etc/sysconfig/i18n $HOME/.i18n ; do
-    	[ -f $langfile ] && . $langfile && sourced=1
-    done    
-fi
+saved_lang="$LANG"
+for langfile in /etc/sysconfig/i18n $HOME/.i18n ; do
+    [ -f $langfile ] && . $langfile && sourced=1
+done
 
-if [ -n "$GDM_LANG" ]; then
-    sourced=1
-    LANG="$GDM_LANG"
-    unset LANGUAGE
-    if [ "$GDM_LANG" = "zh_CN.GB18030" ]; then
-      export LANGUAGE="zh_CN.GB18030:zh_CN.GB2312:zh_CN"
-    fi
+if [ -n "$saved_lang" ]; then
+    LANG="$saved_lang"
 fi
+unset saved_lang
 
 if [ "$sourced" = 1 ]; then
     [ -n "$LANG" ] && export LANG || unset LANG
-- 
cgit v1.2.1