i18n fixes

2002-04-24  Zbigniew Chyla  <cyba@gnome.pl>

	i18n fixes

	* gal/Makefile.am (libgal_2_0_la_LIBADD):
	Removed util/e-unicode-i18n.lo.

	* configure.in: Fixed GETTEXT_PACKAGE.

	* gal/e-table/e-table-group-container.c (compute_text):
	s/U_/_/

	* gal/util/Makefile.am
	(libutil_la_SOURCES): Removed e-unicode-i18n.[ch],
	(libgalinclude_HEADERS): Moved e-i18n.h to libutil_la_SOURCES,
	(INCLUDES): Define GNOMELOCALEDIR.

	* gal/util/e-util.c:
	Added e_gettext().

	* gal/util/e-i18n.h:
	Removed #defines cut&pasted from gnome-i18n.h/bonobo-i18n.h,
	included <bonobo/bonobo-i18n.h> and defined _() macro as
	e_gettext() function call.

	* gal/widgets/e-categories-master-list-array.c (ecmla_default):
	Don't use e_utf8_from_locale_string.

	* gal/e-table/e-cell-text.c,
	gal/e-table/e-table-config-field.c,
	gal/e-table/e-table-item.c,
	gal/e-table/e-tree.c,
	gal/e-text/e-entry-test.c,
	gal/widgets/e-categories.c,
	gal/widgets/e-popup-menu.c,
	gal/widgets/test-color.c:
	Fixed includes.

svn path=/branches/gal-2/; revision=16583

10 files changed, 32 insertions, 43 deletions

diff --git a/e-util/e-i18n.h b/e-util/e-i18n.h
index 07dd595f6b..b468954699 100644
--- a/e-util/e-i18n.h
+++ b/e-util/e-i18n.h
@@ -35,49 +35,17 @@
 #ifndef __E_I18N_H__
 #define __E_I18N_H__
 
-#include <glib.h>
+#include <bonobo/bonobo-i18n.h>
 
 G_BEGIN_DECLS
 
 #ifdef ENABLE_NLS
-#    include <libintl.h>
+	/* this function is defined in e-util.c */
+	extern char *e_gettext (const char *msgid);
 #    undef _
-#    define _(String) dgettext (PACKAGE, String)
-#    ifdef gettext_noop
-#        define N_(String) gettext_noop (String)
-#    else
-#        define N_(String) (String)
-#    endif
-#else
-/* Stubs that do something close enough.  */
-#    define textdomain(String) (String)
-#    define gettext(String) (String)
-#    define dgettext(Domain,Message) (Message)
-#    define dcgettext(Domain,Message,Type) (Message)
-#    define bindtextdomain(Domain,Directory) (Domain)
-#    define _(String) (String)
-#    define N_(String) (String)
+#    define _(String)  e_gettext (String)
 #endif
 
-/*
- * Do not remove the following define, nor do surround it with ifdefs.
- *
- * If you get any `redefined' errors, it means that you are including
- * -incorrectly- a header file provided by gnome-libs before this file.
- * To correctly solve this issue include this file before any libgnome/
- * libgnomeui headers
- */
-
-#define __GNOME_I18N_H__ 1
-
-
-/* This is copied staight out of the prototypes for gnome-i18n.h */
-const char *gnome_i18n_get_language(void);
-GList      *gnome_i18n_get_language_list (const gchar *category_name);
-void	   gnome_i18n_set_preferred_language (const char *val);
-const char *gnome_i18n_get_preferred_language (void);
-void gnome_i18n_init (void);
-
 G_END_DECLS
 
 #endif /* __E_I18N_H__ */
diff --git a/e-util/e-util.c b/e-util/e-util.c
index 4d0e8c6b84..00b10b85b9 100644
--- a/e-util/e-util.c
+++ b/e-util/e-util.c
@@ -23,6 +23,7 @@
 
 #include <config.h>
 #include "e-util.h"
+#include "e-i18n.h"
 
 #include <glib.h>
 #include <gtk/gtkobject.h>
@@ -1051,3 +1052,17 @@ e_strdup_append_strings (gchar *first_string, ...)
 
 	return buffer;
 }
+
+char *
+e_gettext (const char *msgid)
+{
+	static gboolean initialized = FALSE;
+
+	if (!initialized) {
+		bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR);
+		bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
+		initialized = TRUE;
+	}        
+
+	return dgettext (GETTEXT_PACKAGE, msgid);
+}
diff --git a/widgets/misc/e-popup-menu.c b/widgets/misc/e-popup-menu.c
index 5b5c6a16dc..691113c4d2 100644
--- a/widgets/misc/e-popup-menu.c
+++ b/widgets/misc/e-popup-menu.c
@@ -32,7 +32,7 @@
 #include "e-popup-menu.h"
 #include "e-gui-utils.h"
 
-#include <libgnome/gnome-i18n.h>
+#include <gal/util/e-i18n.h>
 
 #ifndef GNOME_APP_HELPER_H
 /* Copied this i18n function to use for the same purpose */
diff --git a/widgets/misc/test-color.c b/widgets/misc/test-color.c
index eecfd41adc..364e0644de 100644
--- a/widgets/misc/test-color.c
+++ b/widgets/misc/test-color.c
@@ -20,6 +20,8 @@
  * 02111-1307, USA.
  */
 
+#include <config.h>
+#include <gal/util/e-i18n.h>
 #include <gnome.h>
 #include "widget-color-combo.h"
 #include "color-palette.h"
diff --git a/widgets/table/e-cell-text.c b/widgets/table/e-cell-text.c
index 5cb4416834..01dcaf6e25 100644
--- a/widgets/table/e-cell-text.c
+++ b/widgets/table/e-cell-text.c
@@ -53,6 +53,7 @@
 #include "gal/util/e-text-event-processor.h"
 #include "gal/e-text/e-text.h"
 #include "gal/util/e-text-event-processor-emacs-like.h"
+#include "gal/util/e-i18n.h"
 #include "e-table-tooltip.h"
 
 #define d(x)
diff --git a/widgets/table/e-table-config-field.c b/widgets/table/e-table-config-field.c
index ad289031f7..fdd460d9cd 100644
--- a/widgets/table/e-table-config-field.c
+++ b/widgets/table/e-table-config-field.c
@@ -26,6 +26,7 @@
 #include <gtk/gtk.h>
 #include <gtk/gtkbox.h>
 #include "gal/util/e-util.h"
+#include "gal/util/e-i18n.h"
 #include "e-table-config-field.h"
 
 #define PARENT_TYPE (gtk_vbox_get_type())
diff --git a/widgets/table/e-table-group-container.c b/widgets/table/e-table-group-container.c
index 6ae303858b..c3b2231dc1 100644
--- a/widgets/table/e-table-group-container.c
+++ b/widgets/table/e-table-group-container.c
@@ -352,14 +352,14 @@ compute_text (ETableGroupContainer *etgc, ETableGroupContainerChildNode *child_n
 
 	if (etgc->ecol->text) {
 		text = g_strdup_printf ((child_node->count == 1)
-					? U_("%s : %s (%d item)")
-					: U_("%s : %s (%d items)"),
+					? _("%s : %s (%d item)")
+					: _("%s : %s (%d items)"),
 					etgc->ecol->text, child_node->string,
 					(gint) child_node->count);
 	} else {
 		text = g_strdup_printf ((child_node->count == 1)
-					? U_("%s (%d item)")
-					: U_("%s (%d items)"),
+					? _("%s (%d item)")
+					: _("%s (%d items)"),
 					child_node->string,
 					(gint) child_node->count);
 	}
diff --git a/widgets/table/e-table-item.c b/widgets/table/e-table-item.c
index 4ae7a7c9a7..e75adbd1d6 100644
--- a/widgets/table/e-table-item.c
+++ b/widgets/table/e-table-item.c
@@ -41,6 +41,7 @@
 #include "gal/widgets/e-canvas.h"
 #include "gal/widgets/e-canvas-utils.h"
 #include "gal/util/e-util.h"
+#include "gal/util/e-i18n.h"
 #include <string.h>
 #include <stdlib.h>
 
diff --git a/widgets/table/e-tree.c b/widgets/table/e-tree.c
index bbc4b82ab8..3e2112cdf1 100644
--- a/widgets/table/e-tree.c
+++ b/widgets/table/e-tree.c
@@ -30,7 +30,7 @@
 #include <gtk/gtksignal.h>
 #include <libgnomecanvas/gnome-canvas-rect-ellipse.h>
 
-#include "gal/util/e-i18n.h"
+#include <gal/util/e-i18n.h>
 #include <gal/util/e-util.h>
 #include <gal/widgets/e-canvas.h>
 
diff --git a/widgets/text/e-entry-test.c b/widgets/text/e-entry-test.c
index 94f490113b..5dc78364d4 100644
--- a/widgets/text/e-entry-test.c
+++ b/widgets/text/e-entry-test.c
@@ -21,10 +21,11 @@
  * 02111-1307, USA.
  */
 
-#include "config.h"
+#include <config.h>
 
 #include <gnome.h>
 #include "e-entry.h"
+#include <gal/util/e-i18n.h>
 
 static void destroy_callback(GtkWidget *app, gpointer data)
 {