149,151c149,150
< # Normalize languages, some places/distros screw us up in /etc/profile,
< # so in case the user did select a language
< if [ -n "$GDM_LANG" ]; then
---
> if [ "$GDM_LANG" != "$LANG" ]; then
>   # If $GDM_LANG & $LANG are different we set all LC_* to $GDM_LANG
153,177c152,164
<   export LANG
< 
<   if [ -n "$LC_ALL" ]; then
<     if [ "$LC_ALL" != "$LANG" ]; then
<       LC_ALL="$LANG"
<     fi
<   else
<     unset LC_ALL
<   fi
< 
<   if [ -n "$LANGUAGE" ]; then
<     if [ "$LANGUAGE" != "$LANG" ]; then
<       LANGUAGE="$LANG"
<     fi
<   else
<     unset LANGUAGE
<   fi
< 
<   if [ -n "$LINGUAS" ]; then
<     if [ "$LINGUAS" != "$LANG" ]; then
<       LINGUAS="$LANG"
<     fi
<   else
<     unset LINGUAS
<   fi
---
>   if [ -n "$LC_CTYPE" ]; then LC_CTYPE="$GDM_LANG"; fi
>   if [ -n "$LC_NUMERIC" ]; then LC_NUMERIC="$GDM_LANG"; fi
>   if [ -n "$LC_TIME" ]; then LC_TIME="$GDM_LANG"; fi
>   if [ -n "$LC_COLLATE" ]; then LC_COLLATE="$GDM_LANG"; fi
>   if [ -n "$LC_MONETARY" ]; then LC_MONETARY="$GDM_LANG"; fi
>   if [ -n "$LC_MESSAGES" ]; then LC_MESSAGES="$GDM_LANG"; fi
>   if [ -n "$LC_PAPER" ]; then LC_PAPER="$GDM_LANG"; fi
>   if [ -n "$LC_NAME" ]; then LC_NAME="$GDM_LANG"; fi
>   if [ -n "$LC_ADDRESS" ]; then LC_ADDRESS="$GDM_LANG"; fi
>   if [ -n "$LC_TELEPHONE" ]; then LC_TELEPHONE="$GDM_LANG"; fi
>   if [ -n "$LC_MEASUREMENT" ]; then LC_MEASUREMENT="$GDM_LANG"; fi
>   if [ -n "$LC_IDENTIFICATION" ]; then LC_IDENTIFICATION="$GDM_LANG"; fi
>   if [ -n "$LC_ALL" ]; then LC_ALL="$GDM_LANG"; fi
180,187d166
< # Normalize all LC_* settings to $LANG
< for var in "LC_ALL" "LC_CTYPE" "LC_NUMERIC" "LC_TIME" "LC_COLLATE" "LC_MONETARY" "LC_MESSAGES" \
< 	"LC_PAPER" "LC_NAME" "LC_ADDRESS" "LC_TELEPHONE" "LC_MEASUREMENT" "LC_IDENTIFICATION" ; do
<   if eval "[ -n \"\$$var\" -a \"\$$var\" != \"\$LANG\" ]" ; then
<     unset $var
<   fi
< done
<