dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Applied patch from Zbigniew Chyla: 

2006-06-27  Sven Neumann  <sven@gimp.org>

	Applied patch from Zbigniew Chyla:

	* app/gimp-intl.h
	* libgimp/stdplugins-intl.h: removed most content and include
	<glib/gi18n.h> instead.

	* libgimp/libgimp-intl.h: define ngettext() macro as wrapper
around
	dngettext().
This commit is contained in:
Sven Neumann 2006-06-27 07:55:41 +00:00 committed by Sven Neumann
parent 7b1327dd86
commit 4c73ba1b17
4 changed files with 16 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ChangeLog
View File

@ -1,3 +1,14 @@
2006-06-27 Sven Neumann <sven@gimp.org>
Applied patch from Zbigniew Chyla:
* app/gimp-intl.h
* libgimp/stdplugins-intl.h: removed most content and include
<glib/gi18n.h> instead.
* libgimp/libgimp-intl.h: define ngettext() macro as wrapper around
dngettext().
2006-06-27 Sven Neumann <sven@gimp.org> 2006-06-27 Sven Neumann <sven@gimp.org>
I18n improvements based on a patch from Zbigniew Chyla: I18n improvements based on a patch from Zbigniew Chyla:

12
app/gimp-intl.h
View File

@ -19,20 +19,10 @@
#ifndef __GIMP_INTL_H__ #ifndef __GIMP_INTL_H__
#define __GIMP_INTL_H__ #define __GIMP_INTL_H__
#ifndef GETTEXT_PACKAGE #ifndef GETTEXT_PACKAGE
#error "config.h must be included prior to gimp-intl.h" #error "config.h must be included prior to gimp-intl.h"
#endif #endif
#include <libintl.h> #include <glib/gi18n.h>
#define _(String) gettext (String)
#ifdef gettext_noop
# define N_(String) gettext_noop (String)
#else
# define N_(String) (String)
#endif
#endif /* __GIMP_INTL_H__ */ #endif /* __GIMP_INTL_H__ */

3
libgimp/libgimp-intl.h
View File

@ -34,6 +34,9 @@
#undef gettext #undef gettext
#define gettext(String) dgettext (GETTEXT_PACKAGE "-libgimp", String) #define gettext(String) dgettext (GETTEXT_PACKAGE "-libgimp", String)
#undef ngettext
#define ngettext(String1, String2, number) dngettext (GETTEXT_PACKAGE "-libgimp", String1, String2, number)
#ifdef gettext_noop #ifdef gettext_noop
# define N_(String) gettext_noop (String) # define N_(String) gettext_noop (String)
#else #else

11
libgimp/stdplugins-intl.h
View File

@ -26,16 +26,7 @@
#error "config.h must be included prior to stdplugins-intl.h" #error "config.h must be included prior to stdplugins-intl.h"
#endif #endif
#include <libintl.h> #include <glib/gi18n.h>
#define _(String) gettext (String)
#ifdef gettext_noop
# define N_(String) gettext_noop (String)
#else
# define N_(String) (String)
#endif
#ifndef HAVE_BIND_TEXTDOMAIN_CODESET #ifndef HAVE_BIND_TEXTDOMAIN_CODESET
# define bind_textdomain_codeset(Domain, Codeset) (Domain) # define bind_textdomain_codeset(Domain, Codeset) (Domain)