Set LANGUAGE instead of LC_ALL to shield against LANGUAGE being set in the

2005-02-23  Matthias Clasen  <mclasen@redhat.com>

	* tests/keyfile-test.c (test_locale_string): Set LANGUAGE
	instead of LC_ALL to shield against LANGUAGE being set in
	the environment.  (#168311, Suren A. Chilingaryan)

diff --git a/ChangeLog b/ChangeLog
index f4884de..a3c8e91 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-02-23  Matthias Clasen  <mclasen@redhat.com>
+
+       * tests/keyfile-test.c (test_locale_string): Set LANGUAGE 
+       instead of LC_ALL to shield against LANGUAGE being set in 
+       the environment.  (#168311, Suren A. Chilingaryan)
+
 Tue Feb 22 22:03:38 2005  Manish Singh  <yosh@gimp.org>
 
        * glib/gstdio.h: On G_OS_UNIX, simple #define g_open and co. as

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index f4884de..a3c8e91 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+2005-02-23  Matthias Clasen  <mclasen@redhat.com>
+
+       * tests/keyfile-test.c (test_locale_string): Set LANGUAGE 
+       instead of LC_ALL to shield against LANGUAGE being set in 
+       the environment.  (#168311, Suren A. Chilingaryan)
+
 Tue Feb 22 22:03:38 2005  Manish Singh  <yosh@gimp.org>
 
        * glib/gstdio.h: On G_OS_UNIX, simple #define g_open and co. as

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index f4884de..a3c8e91 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,9 @@
+2005-02-23  Matthias Clasen  <mclasen@redhat.com>
+
+       * tests/keyfile-test.c (test_locale_string): Set LANGUAGE 
+       instead of LC_ALL to shield against LANGUAGE being set in 
+       the environment.  (#168311, Suren A. Chilingaryan)
+
 Tue Feb 22 22:03:38 2005  Manish Singh  <yosh@gimp.org>
 
        * glib/gstdio.h: On G_OS_UNIX, simple #define g_open and co. as

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index f4884de..a3c8e91 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+2005-02-23  Matthias Clasen  <mclasen@redhat.com>
+
+       * tests/keyfile-test.c (test_locale_string): Set LANGUAGE 
+       instead of LC_ALL to shield against LANGUAGE being set in 
+       the environment.  (#168311, Suren A. Chilingaryan)
+
 Tue Feb 22 22:03:38 2005  Manish Singh  <yosh@gimp.org>
 
        * glib/gstdio.h: On G_OS_UNIX, simple #define g_open and co. as

diff --git a/tests/keyfile-test.c b/tests/keyfile-test.c
index 9b2559f..6680648 100644 (file)
--- a/tests/keyfile-test.c
+++ b/tests/keyfile-test.c
@@ -615,7 +615,7 @@ test_locale_string (void)
 
   /* now test that translations are thrown away */
 
-  g_setenv ("LC_ALL", "de", TRUE);
+  g_setenv ("LANGUAGE", "de", TRUE);
   setlocale (LC_ALL, "");
 
   keyfile = load_data (data, 0);