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

Use either lib/locale or share/locale depending on which one is in

Browse Source 
2007-11-27  Tor Lillqvist  <tml@novell.com>

	* glib/gutils.c (_glib_get_locale_dir) [Win32]: Use either
	lib/locale or share/locale depending on which one is in
	GLIB_LOCALE_DIR. When the configury recognizes GNU gettext (based
	on the _nl_msg_cat_cntr variable, eek), share/locale gets used.

	* glib-zip.in: Likewise, look for message catalogs either in
	lib/locale or share/locale.


svn path=/trunk/; revision=5944
This commit is contained in:
Tor Lillqvist 2007-11-26 22:32:12 +00:00 committed by Tor Lillqvist
parent 13195ef836
commit 007d3ad28a
3 changed files with 43 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ChangeLog
View File

@ -1,3 +1,13 @@
2007-11-27 Tor Lillqvist <tml@novell.com>
* glib/gutils.c (_glib_get_locale_dir) [Win32]: Use either
lib/locale or share/locale depending on which one is in
GLIB_LOCALE_DIR. When the configury recognizes GNU gettext (based
on the _nl_msg_cat_cntr variable, eek), share/locale gets used.
* glib-zip.in: Likewise, look for message catalogs either in
lib/locale or share/locale.
2007-11-26 Matthias Clasen <mclasen@redhat.com> 2007-11-26 Matthias Clasen <mclasen@redhat.com>
* gio/gfileattribute.c: Fix up a doc comment. * gio/gfileattribute.c: Fix up a doc comment.

13
glib-zip.in
View File

@ -16,7 +16,6 @@ cp -p @abs_srcdir@/COPYING share/doc/glib-dev-@GLIB_VERSION@
rm $ZIP rm $ZIP
zip $ZIP -@ <<EOF zip $ZIP -@ <<EOF
COPYING.LIB-2
bin/gspawn-win32-helper.exe bin/gspawn-win32-helper.exe
bin/gspawn-win32-helper-console.exe bin/gspawn-win32-helper-console.exe
bin/libglib-2.0-@LT_CURRENT_MINUS_AGE@.dll bin/libglib-2.0-@LT_CURRENT_MINUS_AGE@.dll
@ -25,7 +24,17 @@ bin/libgobject-2.0-@LT_CURRENT_MINUS_AGE@.dll
bin/libgthread-2.0-@LT_CURRENT_MINUS_AGE@.dll bin/libgthread-2.0-@LT_CURRENT_MINUS_AGE@.dll
EOF EOF
zip -r $ZIP lib/locale/*/LC_MESSAGES/glib20.mo if [ -f lib/locale/de/LC_MESSAGES/glib20.mo -a -f share/locale/de/LC_MESSAGES/glib20.mo ]; then
if [ lib/locale/de/LC_MESSAGES/glib20.mo -nt share/locale/de/LC_MESSAGES/glib20.mo ]; then
zip -r $ZIP lib/locale/*/LC_MESSAGES/glib20.mo
else
zip -r $ZIP share/locale/*/LC_MESSAGES/glib20.mo
fi
elif [ -f lib/locale/de/LC_MESSAGES/glib20.mo ]; then
zip -r $ZIP lib/locale/*/LC_MESSAGES/glib20.mo
else
zip -r $ZIP share/locale/*/LC_MESSAGES/glib20.mo
fi
zip -r $ZIP share/doc/glib-@GLIB_VERSION@ zip -r $ZIP share/doc/glib-@GLIB_VERSION@

36
glib/gutils.c
View File

@ -3136,29 +3136,37 @@ _g_utils_thread_init (void)
/** /**
* _glib_get_locale_dir: * _glib_get_locale_dir:
* *
* Return the path to the lib\locale subfolder of the GLib * Return the path to the share\locale or lib\locale subfolder of the
* installation folder. The path is in the system codepage. We have to * GLib installation folder. The path is in the system codepage. We
* use system codepage as bindtextdomain() doesn't have a UTF-8 * have to use system codepage as bindtextdomain() doesn't have a
* interface. * UTF-8 interface.
*/ */
static gchar * static gchar *
_glib_get_locale_dir (void) _glib_get_locale_dir (void)
{ {
gchar *dir, *cp_dir; gchar *install_dir, *locale_dir;
gchar *retval = NULL; gchar *retval = NULL;
dir = g_win32_get_package_installation_directory (GETTEXT_PACKAGE, dll_name); install_dir = g_win32_get_package_installation_directory (GETTEXT_PACKAGE, dll_name);
cp_dir = g_win32_locale_filename_from_utf8 (dir);
g_free (dir);
if (cp_dir) if (install_dir)
{ {
/* Don't use g_build_filename() on pathnames in the system /*
* codepage. In CJK locales cp_dir might end with a double-byte * Append "/share/locale" or "/lib/locale" depending on whether
* character whose trailing byte is a backslash. * autoconfigury detected GNU gettext or not.
*/ */
retval = g_strconcat (cp_dir, "\\lib\\locale", NULL); const char *p = GLIB_LOCALE_DIR + strlen (GLIB_LOCALE_DIR);
g_free (cp_dir); while (*--p != '/')
;
while (*--p != '/')
;
locale_dir = g_build_filename (install_dir, p, NULL);
retval = g_win32_locale_filename_from_utf8 (locale_dir);
g_free (install_dir);
g_free (locale_dir);
} }
if (retval) if (retval)