diff options
author | Colin Guthrie <colin@mageia.org> | 2014-01-22 00:51:50 +0000 |
---|---|---|
committer | Colin Guthrie <colin@mageia.org> | 2014-01-22 00:52:41 +0000 |
commit | 2fbb89f3fc1b8196f45c6bc02b006e47658f2be1 (patch) | |
tree | ee85ab33f029da944951edfd6041f7983c6acf6e | |
parent | df41bbfe7ba1873c9f851303474177c3ea69e039 (diff) | |
download | initscripts-2fbb89f3fc1b8196f45c6bc02b006e47658f2be1.tar initscripts-2fbb89f3fc1b8196f45c6bc02b006e47658f2be1.tar.gz initscripts-2fbb89f3fc1b8196f45c6bc02b006e47658f2be1.tar.bz2 initscripts-2fbb89f3fc1b8196f45c6bc02b006e47658f2be1.tar.xz initscripts-2fbb89f3fc1b8196f45c6bc02b006e47658f2be1.zip |
Drop support for GDM_LANG.
This is no longer needed/supported.
mga#12328
-rwxr-xr-x | lang.csh | 9 | ||||
-rwxr-xr-x | lang.sh | 9 |
2 files changed, 2 insertions, 16 deletions
@@ -4,17 +4,12 @@ if (! $?LC_SOURCED) then set LC_SOURCED=0 endif -if ($?GDM_LANG) then - set LC_SOURCED=1 - setenv LANG $GDM_LANG -else - foreach file ("$HOME/.i18n" /etc/locale.conf /etc/sysconfig/i18n) +foreach file ("$HOME/.i18n" /etc/locale.conf /etc/sysconfig/i18n) if ($LC_SOURCED != 1 && -f $file ) then eval `sed 's|=C$|=en_US|g' $file | sed 's|^#.*||' | sed 's|\([^=]*\)=\([^=]*\)|setenv \1 \2|g' | sed 's|$|;|' ` setenv LC_SOURCED 1 endif - end -endif +end if ($LC_SOURCED == 1) then if ($?LC_ALL && $?LANG) then @@ -9,15 +9,6 @@ elif [ "$LC_SOURCED_X11" = 1 -a -z "$DISPLAY" ]; then unset LC_SOURCED_X11 fi -# if GDM_LANG is defined that means a language other than the user default -# has been chosen trough gdm login for the session; so we define -# LC_SOURCED=1 to not read the system/user i18n files -if [ -n "$GDM_LANG" ]; then - LANG="$GDM_LANG" - LC_SOURCED=1 - export LC_SOURCED -fi - # only source one of the possible files, and in that order; # if system wide and user config are mixed and different, umpredictable # things will happen... |