[evolution-patches] gal: i18n fix (#42277)

[Radek Doulík <rodo ximian com>]

Attached patch fixes gal's part of i18n brokenness reported in
http://bugzilla.ximian.com/show_bug.cgi?id=42277

Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/gal/ChangeLog,v
retrieving revision 1.767
diff -u -p -r1.767 ChangeLog
--- ChangeLog	6 May 2003 04:56:13 -0000	1.767
+++ ChangeLog	8 May 2003 09:49:48 -0000
@@ -1,3 +1,10 @@
+2003-05-08  Radek Doulik  <rodo ximian com>
+
+	* gal/util/e-util.c (e_gettext): use E_I18N_DOMAIN
+
+	* gal/util/e-i18n.h: use e_gettext as we need our text domain to
+	be binded
+
 2003-05-05  Jeremy Katz  <katzj redhat com>
 
 	* gal/e-text/e-completion-callbacks.c
Index: gal/util/e-i18n.h
===================================================================
RCS file: /cvs/gnome/gal/gal/util/e-i18n.h,v
retrieving revision 1.10
diff -u -p -r1.10 e-i18n.h
--- gal/util/e-i18n.h	31 Oct 2002 21:30:55 -0000	1.10
+++ gal/util/e-i18n.h	8 May 2003 09:49:48 -0000
@@ -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
Index: gal/util/e-util.c
===================================================================
RCS file: /cvs/gnome/gal/gal/util/e-util.c,v
retrieving revision 1.57
diff -u -p -r1.57 e-util.c
--- gal/util/e-util.c	15 Mar 2003 00:34:11 -0000	1.57
+++ gal/util/e-util.c	8 May 2003 09:49:48 -0000
@@ -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);
 }