LANGUAGE variable gets passed via ssh as well, do not overwrite it

diff --git a/lang.sh b/lang.sh
index c240cc9fb68a6938d315c9349cd283af53a54b03..2e88efbe71230f317699fdb67b6aca0a976130bd 100755 (executable)
--- a/lang.sh
+++ b/lang.sh
@@ -16,6 +16,7 @@
        ORG_LC_TELEPHONE=$LC_TELEPHONE
        ORG_LC_TIME=$LC_TIME
        ORG_LC_ALL=$LC_ALL
+       ORG_LANGUAGE=$LANGUAGE
 
 [ -f /etc/sysconfig/i18n ] && . /etc/sysconfig/i18n
 [ -f /etc/locale.conf ] && . /etc/locale.conf
@@ -37,10 +38,11 @@
        LC_TELEPHONE=${ORG_LC_TELEPHONE:-$LC_TELEPHONE}
        LC_TIME=${ORG_LC_TIME:-$LC_TIME}
        LC_ALL=${ORG_LC_ALL:-$LC_ALL}
+       LANGUAGE=${ORG_LANGUAGE:-$LANGUAGE}
 
 unset ORG_LANG ORG_LC_ADDRESS ORG_LC_COLLATE ORG_LC_CTYPE ORG_LC_IDENTIFICATION ORG_LC_MEASUREMENT \
        ORG_LC_MESSAGES ORG_LC_MONETARY ORG_LC_NAME ORG_LC_NUMERIC ORG_LC_PAPER ORG_LC_TELEPHONE \
-       ORG_LC_TIME ORG_LC_ALL
+       ORG_LC_TIME ORG_LC_ALL ORG_LANGUAGE
 
        [ "$LANG" ] && export LANG || unset LANG
        [ "$LC_ADDRESS" ] && export LC_ADDRESS || unset LC_ADDRESS
@@ -56,8 +58,8 @@ unset ORG_LANG ORG_LC_ADDRESS ORG_LC_COLLATE ORG_LC_CTYPE ORG_LC_IDENTIFICATION
        [ "$LC_TELEPHONE" ] && export LC_TELEPHONE || unset LC_TELEPHONE
        [ "$LC_TIME" ] && export LC_TIME || unset LC_TIME
        [ "$LC_ALL" ] && export LC_ALL || unset LC_ALL
+       [ "$LANGUAGE" ] && export LANGUAGE || unset LANGUAGE
 
-[ "$LANGUAGE" ]        && export LANGUAGE
 [ "$LINGUAS" ] && export LINGUAS
 [ "$_XKB_CHARSET" ]    && export _XKB_CHARSET
 [ "$INPUTRC" ] && export INPUTRC