summaryrefslogtreecommitdiff
path: root/debian/patches/04_language_handling.patch
blob: 4f9aa207d9e86b533e9cf20e4cd5c36771827dd7 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
Description: Adjustments due to handling of languages
Forwarded: not-needed
Author: Gunnar Hjalmarsson <gunnarhj@ubuntu.com>

Index: lightdm-1.7.5/liblightdm-gobject/language.c
===================================================================
--- lightdm-1.7.5.orig/liblightdm-gobject/language.c	2013-07-22 11:11:11.049310128 +1200
+++ lightdm-1.7.5/liblightdm-gobject/language.c	2013-07-22 11:11:11.045310128 +1200
@@ -40,7 +40,7 @@
 static void
 update_languages (void)
 {
-    gchar *command = "locale -a";
+    gchar *command = "/usr/share/language-tools/language-options";
     gchar *stdout_text = NULL, *stderr_text = NULL;
     gint exit_status;
     gboolean result;
Index: lightdm-1.7.5/tests/scripts/language-env.conf
===================================================================
--- lightdm-1.7.5.orig/tests/scripts/language-env.conf	2013-07-22 11:11:11.049310128 +1200
+++ lightdm-1.7.5/tests/scripts/language-env.conf	2013-07-22 11:11:11.045310128 +1200
@@ -22,8 +22,8 @@
 #?SESSION-X-0 CONNECT-XSERVER
 
 # Check environment variables
-#?*SESSION-X-0 READ-ENV NAME=LANG
-#?SESSION-X-0 READ-ENV NAME=LANG VALUE=en_AU
+#?*SESSION-X-0 READ-ENV NAME=LANGUAGE
+#?SESSION-X-0 READ-ENV NAME=LANGUAGE VALUE=en_AU
 #?*SESSION-X-0 READ-ENV NAME=GDM_LANG
 #?SESSION-X-0 READ-ENV NAME=GDM_LANG VALUE=en_AU
 
Index: lightdm-1.7.5/src/seat.c
===================================================================
--- lightdm-1.7.5.orig/src/seat.c	2013-07-22 09:38:03.000000000 +1200
+++ lightdm-1.7.5/src/seat.c	2013-07-22 11:11:23.677310505 +1200
@@ -734,7 +734,7 @@
         session_set_env (session, "GDMSESSION", session_name);
         if (language && language[0] != '\0')
         {
-            session_set_env (session, "LANG", language);
+            session_set_env (session, "LANGUAGE", language);
             session_set_env (session, "GDM_LANG", language);
         }
         session_set_pam_service (session, AUTOLOGIN_SERVICE);
@@ -898,7 +898,7 @@
     session_set_env (session, "GDMSESSION", session_name);
     if (language && language[0] != '\0')
     {
-        session_set_env (session, "LANG", language);
+        session_set_env (session, "LANGUAGE", language);
         session_set_env (session, "GDM_LANG", language);
     }