diff options
-rw-r--r-- | e-util/e-i18n.h | 3 | ||||
-rw-r--r-- | e-util/e-util.c | 6 |
2 files changed, 4 insertions, 5 deletions
diff --git a/e-util/e-i18n.h b/e-util/e-i18n.h index 2bc8b93a04..829b2480aa 100644 --- a/e-util/e-i18n.h +++ b/e-util/e-i18n.h @@ -44,14 +44,13 @@ G_BEGIN_DECLS extern char *e_gettext (const char *msgid); # undef _ # ifdef GNOME_EXPLICIT_TRANSLATION_DOMAIN -# define _(String) dgettext (GNOME_EXPLICIT_TRANSLATION_DOMAIN, String) /* No parentheses allowed here since that breaks string concatenation. */ # define E_I18N_DOMAIN GNOME_EXPLICIT_TRANSLATION_DOMAIN # else -# define _(String) dgettext (PACKAGE, String) /* No parentheses allowed here since that breaks string concatenation. */ # define E_I18N_DOMAIN PACKAGE # endif +# define _(String) e_gettext (String) # ifdef gettext_noop # define N_(String) gettext_noop (String) # else diff --git a/e-util/e-util.c b/e-util/e-util.c index 4e3584a059..46be2143f7 100644 --- a/e-util/e-util.c +++ b/e-util/e-util.c @@ -1140,11 +1140,11 @@ e_gettext (const char *msgid) static gboolean initialized = FALSE; if (!initialized) { - bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR); - bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); + bindtextdomain (E_I18N_DOMAIN, GNOMELOCALEDIR); + bind_textdomain_codeset (E_I18N_DOMAIN, "UTF-8"); initialized = TRUE; } - return dgettext (GETTEXT_PACKAGE, msgid); + return dgettext (E_I18N_DOMAIN, msgid); } |