From db0d5b6b61662e71c0a8e2ee92eecb1f6bbc313d Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Thu, 24 Feb 2005 03:54:42 +0000 Subject: [PATCH] Set LANGUAGE instead of LC_ALL to shield against LANGUAGE being set in the 2005-02-23 Matthias Clasen * 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) --- ChangeLog | 6 ++++++ ChangeLog.pre-2-10 | 6 ++++++ ChangeLog.pre-2-12 | 6 ++++++ ChangeLog.pre-2-8 | 6 ++++++ tests/keyfile-test.c | 2 +- 5 files changed, 25 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index f4884de4c..a3c8e9175 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2005-02-23 Matthias Clasen + + * 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 * 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 f4884de4c..a3c8e9175 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +2005-02-23 Matthias Clasen + + * 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 * 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 f4884de4c..a3c8e9175 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,3 +1,9 @@ +2005-02-23 Matthias Clasen + + * 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 * 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 f4884de4c..a3c8e9175 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ +2005-02-23 Matthias Clasen + + * 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 * 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 9b2559f33..6680648b7 100644 --- 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);