debian/patches/04_language_handling.patch

   1 Description: Adjustments due to handling of languages
   2 Forwarded: not-needed
   3 Author: Gunnar Hjalmarsson <gunnarhj@ubuntu.com>
   4
   5 Index: trunk/liblightdm-gobject/language.c
   6 ===================================================================
   7 --- trunk.orig/liblightdm-gobject/language.c    2013-09-25 12:08:11.120803355 +1200
   8 +++ trunk/liblightdm-gobject/language.c 2013-09-25 12:08:11.112803355 +1200
   9 @@ -40,7 +40,7 @@
  10  static void
  11  update_languages (void)
  12  {
  13 -    gchar *command = "locale -a";
  14 +    gchar *command = "/usr/share/language-tools/language-options";
  15      gchar *stdout_text = NULL, *stderr_text = NULL;
  16      gint exit_status;
  17      gboolean result;
  18 Index: trunk/tests/scripts/language-env.conf
  19 ===================================================================
  20 --- trunk.orig/tests/scripts/language-env.conf  2013-09-25 12:08:11.120803355 +1200
  21 +++ trunk/tests/scripts/language-env.conf       2013-09-25 12:08:11.112803355 +1200
  22 @@ -22,8 +22,8 @@
  23  #?SESSION-X-0 CONNECT-XSERVER
  24
  25  # Check environment variables
  26 -#?*SESSION-X-0 READ-ENV NAME=LANG
  27 -#?SESSION-X-0 READ-ENV NAME=LANG VALUE=en_AU
  28 +#?*SESSION-X-0 READ-ENV NAME=LANGUAGE
  29 +#?SESSION-X-0 READ-ENV NAME=LANGUAGE VALUE=en_AU
  30  #?*SESSION-X-0 READ-ENV NAME=GDM_LANG
  31  #?SESSION-X-0 READ-ENV NAME=GDM_LANG VALUE=en_AU
  32
  33 Index: trunk/src/seat.c
  34 ===================================================================
  35 --- trunk.orig/src/seat.c       2013-09-25 12:08:11.120803355 +1200
  36 +++ trunk/src/seat.c    2013-09-25 12:08:11.112803355 +1200
  37 @@ -849,7 +849,7 @@
  38              session_set_env (session, "XDG_CURRENT_DESKTOP", desktop_name);
  39          if (language && language[0] != '\0')
  40          {
  41 -            session_set_env (session, "LANG", language);
  42 +            session_set_env (session, "LANGUAGE", language);
  43              session_set_env (session, "GDM_LANG", language);
  44          }
  45          session_set_username (session, username);
  46 @@ -1008,7 +1008,7 @@
  47          session_set_env (session, "XDG_CURRENT_DESKTOP", desktop_name);
  48      if (language && language[0] != '\0')
  49      {
  50 -        session_set_env (session, "LANG", language);
  51 +        session_set_env (session, "LANGUAGE", language);
  52          session_set_env (session, "GDM_LANG", language);
  53      }
  54