mirror of
https://gitlab.gnome.org/GNOME/glib.git
synced 2025-03-03 06:32:10 +01:00
to get the default translation target on win32 use g_win32_get_locale()
2008-06-13 Hans Breuer <hans@breuer.org> * glib/gstrfuncs.c : to get the default translation target on win32 use g_win32_get_locale() instead of setlocale(LS_MESSAGES,NULL) Fixes bug #538044 * glib/makefile.msc.in gio/makefile.msc : updated svn path=/trunk/; revision=7036
This commit is contained in:
parent
e5347891fe
commit
43eeb244ac
@ -1,3 +1,11 @@
|
||||
2008-06-13 Hans Breuer <hans@breuer.org>
|
||||
|
||||
* glib/gstrfuncs.c : to get the default translation target on
|
||||
win32 use g_win32_get_locale() instead of setlocale(LS_MESSAGES,NULL)
|
||||
Fixes bug #538044
|
||||
|
||||
* glib/makefile.msc.in gio/makefile.msc : updated
|
||||
|
||||
2008-06-12 Matthias Clasen <mclasen@redhat.com>
|
||||
|
||||
* configure.in: Bump version
|
||||
|
@ -129,7 +129,8 @@ OBJECTS = \
|
||||
glocaldirectorymonitor.obj \
|
||||
gwin32appinfo.obj \
|
||||
\
|
||||
gio-marshal.obj
|
||||
gio-marshal.obj \
|
||||
gwin32directorymonitor.obj
|
||||
|
||||
libgio_2_0_la_LIBADD = \
|
||||
$(top_builddir)/glib/libglib-2.0.la \
|
||||
@ -248,6 +249,8 @@ gio.def: gio.symbols
|
||||
-DG_GNUC_MALLOC= -DG_GNUC_CONST= -DG_GNUC_NULL_TERMINATED= -DG_GNUC_NORETURN= \
|
||||
-DG_GNUC_PRINTF=;G_GNUC_PRINTF gio.symbols >> gio.def
|
||||
|
||||
gwin32directorymonitor.obj : win32\gwin32directorymonitor.c
|
||||
$(CC) $(CFLAGS) -I win32 -c win32\gwin32directorymonitor.c
|
||||
|
||||
RESOURCE = $(PACKAGE).res
|
||||
|
||||
@ -255,7 +258,7 @@ libgio-$(PKG_VER).dll : $(OBJECTS) $(PACKAGE).def
|
||||
$(CC) $(CFLAGS) -LD -Felibgio-$(PKG_VER).dll $(OBJECTS) \
|
||||
..\glib\glib-2.0.lib ..\gobject\gobject-2.0.lib ..\gmodule\gmodule-2.0.lib \
|
||||
$(INTL_LIBS) \
|
||||
user32.lib advapi32.lib shell32.lib wsock32.lib $(LDFLAGS) \
|
||||
kernel32.lib user32.lib advapi32.lib shell32.lib wsock32.lib $(LDFLAGS) \
|
||||
/implib:gio-2.0.lib /def:$(PACKAGE).def
|
||||
|
||||
.c.obj :
|
||||
|
@ -2922,8 +2922,11 @@ _g_dgettext_should_translate (void)
|
||||
|
||||
const char *default_domain = textdomain (NULL);
|
||||
const char *translator_comment = gettext ("");
|
||||
#ifndef G_OS_WIN32
|
||||
const char *translate_locale = setlocale (LC_MESSAGES, NULL);
|
||||
|
||||
#else
|
||||
const char *translate_locale = g_win32_getlocale ();
|
||||
#endif
|
||||
/* We should NOT translate only if all the following hold:
|
||||
* - user has called textdomain() and set textdomain to non-default
|
||||
* - default domain has no translations
|
||||
|
@ -51,7 +51,6 @@ glib_OBJECTS = \
|
||||
gfileutils.obj \
|
||||
ghash.obj \
|
||||
ghook.obj \
|
||||
gi18n.obj \
|
||||
giochannel.obj \
|
||||
giowin32.obj \
|
||||
gkeyfile.obj \
|
||||
|
Loading…
x
Reference in New Issue
Block a user