luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-01-23 20:46:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

gio tools: Use the proper string for default locale for setlocale()

Browse Source 
This makes use of the string we now have from glib-private.h in the
last commit so that setlocale() sets the default system locale
correctly and therefore show the translated messages properly.

Fixes issue #1169.
This commit is contained in:
Chun-wei Fan 2019-06-05 16:42:30 +08:00
parent 3e5d1bd6ff
commit 9f709fe1e9
6 changed files with 9 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gio/gio-querymodules.c
View File

@ -26,6 +26,8 @@
#include <errno.h> #include <errno.h>
#include <locale.h> #include <locale.h>
#include "glib/glib-private.h"
static gboolean static gboolean
is_valid_module_name (const gchar *basename) is_valid_module_name (const gchar *basename)
{ {
@ -160,7 +162,7 @@ main (gint argc,
return 1; return 1;
} }
setlocale (LC_ALL, ""); setlocale (LC_ALL, GLIB_DEFAULT_LOCALE);
/* Be defensive and ensure we're linked to GObject */ /* Be defensive and ensure we're linked to GObject */
g_type_ensure (G_TYPE_OBJECT); g_type_ensure (G_TYPE_OBJECT);

4
gio/gio-tool.c
View File

@ -28,7 +28,7 @@
#include <errno.h> #include <errno.h>
#include "gio-tool.h" #include "gio-tool.h"
#include "glib/glib-private.h"
void void
print_error (const gchar *format, ...) print_error (const gchar *format, ...)
@ -253,7 +253,7 @@ main (int argc, char **argv)
const char *command; const char *command;
gboolean do_help; gboolean do_help;
setlocale (LC_ALL, ""); setlocale (LC_ALL, GLIB_DEFAULT_LOCALE);
textdomain (GETTEXT_PACKAGE); textdomain (GETTEXT_PACKAGE);
bindtextdomain (GETTEXT_PACKAGE, GLIB_LOCALE_DIR); bindtextdomain (GETTEXT_PACKAGE, GLIB_LOCALE_DIR);

5
gio/glib-compile-resources.c
View File

@ -43,10 +43,7 @@
#include "gvdb/gvdb-builder.h" #include "gvdb/gvdb-builder.h"
#include "gconstructor_as_data.h" #include "gconstructor_as_data.h"
#ifdef G_OS_WIN32
#include "glib/glib-private.h" #include "glib/glib-private.h"
#endif
typedef struct typedef struct
{ {
@ -754,7 +751,7 @@ main (int argc, char **argv)
gchar *tmp; gchar *tmp;
#endif #endif
setlocale (LC_ALL, ""); setlocale (LC_ALL, GLIB_DEFAULT_LOCALE);
textdomain (GETTEXT_PACKAGE); textdomain (GETTEXT_PACKAGE);
#ifdef G_OS_WIN32 #ifdef G_OS_WIN32

5
gio/glib-compile-schemas.c
View File

@ -29,10 +29,7 @@
#include "gvdb/gvdb-builder.h" #include "gvdb/gvdb-builder.h"
#include "strinfo.c" #include "strinfo.c"
#ifdef G_OS_WIN32
#include "glib/glib-private.h" #include "glib/glib-private.h"
#endif
static void static void
strip_string (GString *string) strip_string (GString *string)
@ -2188,7 +2185,7 @@ main (int argc, char **argv)
gchar *tmp = NULL; gchar *tmp = NULL;
#endif #endif
setlocale (LC_ALL, ""); setlocale (LC_ALL, GLIB_DEFAULT_LOCALE);
textdomain (GETTEXT_PACKAGE); textdomain (GETTEXT_PACKAGE);
#ifdef G_OS_WIN32 #ifdef G_OS_WIN32

4
gio/gresource-tool.c
View File

@ -41,9 +41,7 @@
#include <glib/gstdio.h> #include <glib/gstdio.h>
#include <gi18n.h> #include <gi18n.h>
#ifdef G_OS_WIN32
#include "glib/glib-private.h" #include "glib/glib-private.h"
#endif
#if defined(HAVE_LIBELF) && defined(HAVE_MMAP) #if defined(HAVE_LIBELF) && defined(HAVE_MMAP)
#define USE_LIBELF #define USE_LIBELF
@ -610,7 +608,7 @@ main (int argc, char *argv[])
gchar *tmp; gchar *tmp;
#endif #endif
setlocale (LC_ALL, ""); setlocale (LC_ALL, GLIB_DEFAULT_LOCALE);
textdomain (GETTEXT_PACKAGE); textdomain (GETTEXT_PACKAGE);
#ifdef G_OS_WIN32 #ifdef G_OS_WIN32

4
gio/gsettings-tool.c
View File

@ -25,9 +25,7 @@
#include <string.h> #include <string.h>
#include <stdlib.h> #include <stdlib.h>
#ifdef G_OS_WIN32
#include "glib/glib-private.h" #include "glib/glib-private.h"
#endif
static GSettingsSchemaSource *global_schema_source; static GSettingsSchemaSource *global_schema_source;
static GSettings *global_settings; static GSettings *global_settings;
@ -743,7 +741,7 @@ main (int argc, char **argv)
gchar *tmp; gchar *tmp;
#endif #endif
setlocale (LC_ALL, ""); setlocale (LC_ALL, GLIB_DEFAULT_LOCALE);
textdomain (GETTEXT_PACKAGE); textdomain (GETTEXT_PACKAGE);
#ifdef G_OS_WIN32 #ifdef G_OS_WIN32