[gnome-color-manager] Ensure translations are loaded in all the end-user programs

[Richard Hughes <rhughes src gnome org>]

commit 21a488327bce136b0b4677dd90e2646dbd3adc66
Author: Richard Hughes <richard hughsie com>
Date:   Wed Nov 25 15:48:15 2009 +0000

    Ensure translations are loaded in all the end-user programs

 src/Makefile.am   |    2 +-
 src/gcm-apply.c   |    9 +++++++++
 src/gcm-import.c  |    9 +++++++++
 src/gcm-inspect.c |    9 +++++++++
 src/gcm-prefs.c   |    9 +++++++++
 src/gcm-session.c |    7 +++++++
 6 files changed, 44 insertions(+), 1 deletions(-)
---
diff --git a/src/Makefile.am b/src/Makefile.am
index 68ab31a..01e5400 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -13,7 +13,7 @@ INCLUDES =						\
 	-DBINDIR=\"$(bindir)\"			 	\
 	-DSYSCONFDIR=\""$(sysconfdir)"\" 		\
 	-DVERSION="\"$(VERSION)\"" 			\
-	-DPACKAGE_LOCALE_DIR=\"$(localedir)\"		\
+	-DLOCALEDIR=\""$(localedir)"\"			\
 	-DGCM_DATA=\"$(pkgdatadir)\"
 
 noinst_LIBRARIES = libgcmshared.a
diff --git a/src/gcm-apply.c b/src/gcm-apply.c
index 9e9ae07..e20b71e 100644
--- a/src/gcm-apply.c
+++ b/src/gcm-apply.c
@@ -19,9 +19,12 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
+#include "config.h"
+
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
 #include <math.h>
+#include <locale.h>
 
 #include "egg-debug.h"
 
@@ -48,6 +51,12 @@ main (int argc, char **argv)
 		{ NULL}
 	};
 
+	setlocale (LC_ALL, "");
+
+	bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
+	bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
+	textdomain (GETTEXT_PACKAGE);
+
 	gtk_init (&argc, &argv);
 
 	context = g_option_context_new ("gnome-color-manager apply program");
diff --git a/src/gcm-import.c b/src/gcm-import.c
index 56017b2..7edc15f 100644
--- a/src/gcm-import.c
+++ b/src/gcm-import.c
@@ -19,9 +19,12 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
+#include "config.h"
+
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
 #include <math.h>
+#include <locale.h>
 
 #include "egg-debug.h"
 
@@ -54,6 +57,12 @@ main (int argc, char **argv)
 		{ NULL}
 	};
 
+	setlocale (LC_ALL, "");
+
+	bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
+	bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
+	textdomain (GETTEXT_PACKAGE);
+
 	gtk_init (&argc, &argv);
 
 	context = g_option_context_new ("gnome-color-manager import program");
diff --git a/src/gcm-inspect.c b/src/gcm-inspect.c
index fe19e44..0080efc 100644
--- a/src/gcm-inspect.c
+++ b/src/gcm-inspect.c
@@ -19,10 +19,13 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
+#include "config.h"
+
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
 #include <libgnomeui/gnome-rr.h>
 #include <dbus/dbus-glib.h>
+#include <locale.h>
 
 #include "egg-debug.h"
 
@@ -227,6 +230,12 @@ main (int argc, char **argv)
 		{ NULL}
 	};
 
+	setlocale (LC_ALL, "");
+
+	bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
+	bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
+	textdomain (GETTEXT_PACKAGE);
+
 	gtk_init (&argc, &argv);
 
 	context = g_option_context_new ("gnome-color-manager inspect program");
diff --git a/src/gcm-prefs.c b/src/gcm-prefs.c
index 91e8b57..49d2dcc 100644
--- a/src/gcm-prefs.c
+++ b/src/gcm-prefs.c
@@ -19,6 +19,8 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
+#include "config.h"
+
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
 #include <math.h>
@@ -27,6 +29,7 @@
 #include <gudev/gudev.h>
 #include <libgnomeui/gnome-rr.h>
 #include <gconf/gconf-client.h>
+#include <locale.h>
 
 #include "egg-debug.h"
 
@@ -1583,6 +1586,12 @@ main (int argc, char **argv)
 		{ NULL}
 	};
 
+	setlocale (LC_ALL, "");
+
+	bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
+	bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
+	textdomain (GETTEXT_PACKAGE);
+
 	gtk_init (&argc, &argv);
 
 	context = g_option_context_new ("gnome-color-manager prefs program");
diff --git a/src/gcm-session.c b/src/gcm-session.c
index b5cfff2..8e02e8c 100644
--- a/src/gcm-session.c
+++ b/src/gcm-session.c
@@ -24,6 +24,7 @@
 #include <glib/gi18n.h>
 #include <dbus/dbus-glib.h>
 #include <gtk/gtk.h>
+#include <locale.h>
 
 #include "egg-debug.h"
 #include "gcm-dbus.h"
@@ -124,6 +125,12 @@ main (int argc, char *argv[])
 		{ NULL}
 	};
 
+	setlocale (LC_ALL, "");
+
+	bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
+	bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
+	textdomain (GETTEXT_PACKAGE);
+
 	if (! g_thread_supported ())
 		g_thread_init (NULL);
 	dbus_g_thread_init ();