From 4c73ba1b172a99669b61a01451e21d10d8322f39 Mon Sep 17 00:00:00 2001 From: Sven Neumann Date: Tue, 27 Jun 2006 07:55:41 +0000 Subject: [PATCH] Applied patch from Zbigniew Chyla: 2006-06-27 Sven Neumann Applied patch from Zbigniew Chyla: * app/gimp-intl.h * libgimp/stdplugins-intl.h: removed most content and include instead. * libgimp/libgimp-intl.h: define ngettext() macro as wrapper around dngettext(). --- ChangeLog | 11 +++++++++++ app/gimp-intl.h | 12 +----------- libgimp/libgimp-intl.h | 3 +++ libgimp/stdplugins-intl.h | 11 +---------- 4 files changed, 16 insertions(+), 21 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0393dec6e0..dc04c92ca1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +2006-06-27 Sven Neumann + + Applied patch from Zbigniew Chyla: + + * app/gimp-intl.h + * libgimp/stdplugins-intl.h: removed most content and include + instead. + + * libgimp/libgimp-intl.h: define ngettext() macro as wrapper around + dngettext(). + 2006-06-27 Sven Neumann I18n improvements based on a patch from Zbigniew Chyla: diff --git a/app/gimp-intl.h b/app/gimp-intl.h index 74981f154f..a0278ead61 100644 --- a/app/gimp-intl.h +++ b/app/gimp-intl.h @@ -19,20 +19,10 @@ #ifndef __GIMP_INTL_H__ #define __GIMP_INTL_H__ - #ifndef GETTEXT_PACKAGE #error "config.h must be included prior to gimp-intl.h" #endif -#include - -#define _(String) gettext (String) - -#ifdef gettext_noop -# define N_(String) gettext_noop (String) -#else -# define N_(String) (String) -#endif - +#include #endif /* __GIMP_INTL_H__ */ diff --git a/libgimp/libgimp-intl.h b/libgimp/libgimp-intl.h index 45012a0f2d..4656c7e7c9 100644 --- a/libgimp/libgimp-intl.h +++ b/libgimp/libgimp-intl.h @@ -34,6 +34,9 @@ #undef gettext #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 # define N_(String) gettext_noop (String) #else diff --git a/libgimp/stdplugins-intl.h b/libgimp/stdplugins-intl.h index 1c5102eeab..78aadbaf82 100644 --- a/libgimp/stdplugins-intl.h +++ b/libgimp/stdplugins-intl.h @@ -26,16 +26,7 @@ #error "config.h must be included prior to stdplugins-intl.h" #endif -#include - - -#define _(String) gettext (String) - -#ifdef gettext_noop -# define N_(String) gettext_noop (String) -#else -# define N_(String) (String) -#endif +#include #ifndef HAVE_BIND_TEXTDOMAIN_CODESET # define bind_textdomain_codeset(Domain, Codeset) (Domain)