From 7654a848e2b575eaf278fafe05aa5be1b3afdc26 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= Date: Tue, 5 Jul 2011 14:30:31 +0100 Subject: [PATCH] tests: fix glib_translations_work() If setlocale() to our test locale fails, translations won't work either. https://bugzilla.gnome.org/show_bug.cgi?id=654017 --- gio/tests/gsettings.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/gio/tests/gsettings.c b/gio/tests/gsettings.c index e178a054d..ded80986b 100644 --- a/gio/tests/gsettings.c +++ b/gio/tests/gsettings.c @@ -1479,17 +1479,19 @@ test_child_schema (void) static gboolean glib_translations_work (void) { + gboolean works; gchar *locale; gchar *orig = "Unnamed"; - gchar *str; locale = g_strdup (setlocale (LC_MESSAGES, NULL)); - setlocale (LC_MESSAGES, "de"); - str = dgettext ("glib20", orig); + if (!setlocale (LC_MESSAGES, "de")) + works = FALSE; + else + works = dgettext ("glib20", orig) != orig; setlocale (LC_MESSAGES, locale); g_free (locale); - return str != orig; + return works; } #include "../strinfo.c"