current/SOURCES/0111-Drop-support-for-GDM_LANG.patch

From 2fbb89f3fc1b8196f45c6bc02b006e47658f2be1 Mon Sep 17 00:00:00 2001
From: Colin Guthrie <colin@mageia.org>
Date: Wed, 22 Jan 2014 00:51:50 +0000
Subject: [PATCH] Drop support for GDM_LANG.

This is no longer needed/supported.

mga#12328
---
 lang.csh | 9 ++-------
 lang.sh  | 9 ---------
 2 files changed, 2 insertions(+), 16 deletions(-)

diff --git a/lang.csh b/lang.csh
index f85a6e9..4978981 100755
--- a/lang.csh
+++ b/lang.csh
@@ -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
diff --git a/lang.sh b/lang.sh
index 8ece9ac..f90c079 100755
--- a/lang.sh
+++ b/lang.sh
@@ -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...
-- 
1.8.4.5

1	From 2fbb89f3fc1b8196f45c6bc02b006e47658f2be1 Mon Sep 17 00:00:00 2001
2	From: Colin Guthrie <colin@mageia.org>
3	Date: Wed, 22 Jan 2014 00:51:50 +0000
4	Subject: [PATCH] Drop support for GDM_LANG.
5
6	This is no longer needed/supported.
7
8	mga#12328
9	---
10	lang.csh \| 9 ++-------
11	lang.sh \| 9 ---------
12	2 files changed, 2 insertions(+), 16 deletions(-)
13
14	diff --git a/lang.csh b/lang.csh
15	index f85a6e9..4978981 100755
16	--- a/lang.csh
17	+++ b/lang.csh
18	@@ -4,17 +4,12 @@ if (! $?LC_SOURCED) then
19	set LC_SOURCED=0
20	endif
21
22	-if ($?GDM_LANG) then
23	- set LC_SOURCED=1
24	- setenv LANG $GDM_LANG
25	-else
26	- foreach file ("$HOME/.i18n" /etc/locale.conf /etc/sysconfig/i18n)
27	+foreach file ("$HOME/.i18n" /etc/locale.conf /etc/sysconfig/i18n)
28	if ($LC_SOURCED != 1 && -f $file ) then
29	eval `sed 's\|=C$\|=en_US\|g' $file \| sed 's\|^#.\|\|' \| sed 's\|\([^=]\)=\([^=]*\)\|setenv \1 \2\|g' \| sed 's\|$\|;\|' `
30	setenv LC_SOURCED 1
31	endif
32	- end
33	-endif
34	+end
35
36	if ($LC_SOURCED == 1) then
37	if ($?LC_ALL && $?LANG) then
38	diff --git a/lang.sh b/lang.sh
39	index 8ece9ac..f90c079 100755
40	--- a/lang.sh
41	+++ b/lang.sh
42	@@ -9,15 +9,6 @@ elif [ "$LC_SOURCED_X11" = 1 -a -z "$DISPLAY" ]; then
43	unset LC_SOURCED_X11
44	fi
45
46	-# if GDM_LANG is defined that means a language other than the user default
47	-# has been chosen trough gdm login for the session; so we define
48	-# LC_SOURCED=1 to not read the system/user i18n files
49	-if [ -n "$GDM_LANG" ]; then
50	- LANG="$GDM_LANG"
51	- LC_SOURCED=1
52	- export LC_SOURCED
53	-fi
54	-
55	# only source one of the possible files, and in that order;
56	# if system wide and user config are mixed and different, umpredictable
57	# things will happen...
58	--
59	1.8.4.5
60