Canonicalize the behavior. (#372151)initscripts-8.74-1

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.

1 files changed, 8 insertions, 7 deletions

diff --git a/lang.sh b/lang.sh
index 705e7a58..7fe9e3ff 100755
--- a/lang.sh
+++ b/lang.sh
@@ -2,15 +2,16 @@
 
 sourced=0
 
-saved_lang="$LANG"
-for langfile in /etc/sysconfig/i18n $HOME/.i18n ; do
-    [ -f $langfile ] && . $langfile && sourced=1
-done
-
-if [ -n "$saved_lang" ]; then
+if [ -n "$LANG" ]; then
+    saved_lang="$LANG"
+    [ -f $HOME/.i18n ] && . $HOME/.i18n && sourced=1
     LANG="$saved_lang"
+    unset saved_lang
+else
+    for langfile in /etc/sysconfig/i18n $HOME/.i18n ; do
+        [ -f $langfile ] && . $langfile && sourced=1
+    done
 fi
-unset saved_lang
 
 if [ "$sourced" = 1 ]; then
     [ -n "$LANG" ] && export LANG || unset LANG