[glib/glib-2-28] tests: fix glib_translations_work()



commit e72314f369c5567796eef433d40d0a7045d2d531
Author: Tim-Philipp MÃller <tim muller collabora co uk>
Date:   Tue Jul 5 14:30:31 2011 +0100

    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 files changed, 6 insertions(+), 4 deletions(-)
---
diff --git a/gio/tests/gsettings.c b/gio/tests/gsettings.c
index b2f9d4f..b70ff4e 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"



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]