[gnome-games] Correctly initialize gettext

From: Robert Ancell <rancell src gnome org>
To: commits-list gnome org
Cc:
Subject: [gnome-games] Correctly initialize gettext
Date: Mon, 30 Jan 2012 02:31:10 +0000 (UTC)
commit 060745ece48d6fc54fc456619a72650b71c18932
Author: Robert Ancell <robert ancell canonical com>
Date:   Mon Jan 30 12:22:00 2012 +1100

    Correctly initialize gettext

 glines/src/Makefile.am       |    1 +
 glines/src/glines.c          |    7 ++++++-
 gnect/src/Makefile.am        |    1 +
 gnect/src/main.c             |    5 +++++
 gnibbles/src/Makefile.am     |    1 +
 gnibbles/src/main.c          |    5 +++++
 gnobots2/src/Makefile.am     |    1 +
 gnobots2/src/gnobots.c       |    5 +++++
 gnomine/src/Makefile.am      |    1 +
 gnomine/src/config.vapi      |    1 +
 gnomine/src/gnomine.vala     |    5 +++++
 gnotravex/src/Makefile.am    |    1 +
 gnotravex/src/config.vapi    |    3 ++-
 gnotravex/src/gnotravex.vala |    5 +++++
 gnotski/src/Makefile.am      |    3 ++-
 gnotski/src/gnotski.c        |    5 +++++
 gtali/src/Makefile.am        |    1 +
 gtali/src/gyahtzee.c         |    5 +++++
 iagno/src/Makefile.am        |    1 +
 iagno/src/config.vapi        |    1 +
 iagno/src/iagno.vala         |    5 +++++
 lightsoff/src/Makefile.am    |    1 +
 lightsoff/src/config.vapi    |    1 +
 lightsoff/src/lightsoff.vala |    5 +++++
 mahjongg/src/Makefile.am     |    1 +
 mahjongg/src/config.vapi     |    1 +
 mahjongg/src/mahjongg.vala   |    5 +++++
 quadrapassel/src/Makefile.am |    1 +
 quadrapassel/src/main.cpp    |    6 ++++++
 29 files changed, 81 insertions(+), 3 deletions(-)
---
diff --git a/glines/src/Makefile.am b/glines/src/Makefile.am
index 07ed52c..110ac04 100644
--- a/glines/src/Makefile.am
+++ b/glines/src/Makefile.am
@@ -10,6 +10,7 @@ glines_CPPFLAGS = \
 
 glines_CFLAGS = \
 	-DDATA_DIRECTORY=\"$(datadir)/glines\" \
+	-DLOCALEDIR=\"$(datadir)/locale\" \
 	$(GMODULE_CFLAGS) \
 	$(GTK_CFLAGS)	\
 	$(AM_CFLAGS)
diff --git a/glines/src/glines.c b/glines/src/glines.c
index a5a3f44..14d1cb1 100644
--- a/glines/src/glines.c
+++ b/glines/src/glines.c
@@ -1506,12 +1506,17 @@ main (int argc, char *argv[])
   gboolean retval;
   GError *error = NULL;
 
+  setlocale (LC_ALL, "");
+  bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
+  bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
+  textdomain (GETTEXT_PACKAGE);
+
   games_scores_startup ();
 
   rgen = g_rand_new ();
 
   context = g_option_context_new (NULL);
-  g_option_context_set_translation_domain (context, GETTEXT_PACKAGE);
+  g_option_context_set_translation_dmoain (context, GETTEXT_PACKAGE);
   g_option_context_add_group (context, gtk_get_option_group (TRUE));
 
   retval = g_option_context_parse (context, &argc, &argv, &error);
diff --git a/gnect/src/Makefile.am b/gnect/src/Makefile.am
index a8ad930..9232d50 100644
--- a/gnect/src/Makefile.am
+++ b/gnect/src/Makefile.am
@@ -30,6 +30,7 @@ gnect_CPPFLAGS = \
 gnect_CFLAGS = \
 	-DDATA_DIRECTORY=\"$(datadir)/gnect\" \
 	-DSOUND_DIRECTORY=\"$(pkgdatadir)/sounds\" \
+	-DLOCALEDIR=\"$(datadir)/locale\" \
 	$(GTK_CFLAGS) \
 	$(CANBERRA_GTK_CFLAGS) \
 	$(AM_CFLAGS)
diff --git a/gnect/src/main.c b/gnect/src/main.c
index 468ad8f..7925873 100644
--- a/gnect/src/main.c
+++ b/gnect/src/main.c
@@ -1355,6 +1355,11 @@ main (int argc, char *argv[])
   gboolean retval;
   GError *error = NULL;
 
+  setlocale (LC_ALL, "");
+  bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
+  bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
+  textdomain (GETTEXT_PACKAGE);
+
   context = g_option_context_new (NULL);
   g_option_context_add_group (context, gtk_get_option_group (TRUE));
   retval = g_option_context_parse (context, &argc, &argv, &error);
diff --git a/gnibbles/src/Makefile.am b/gnibbles/src/Makefile.am
index e7451b8..88aa2da 100644
--- a/gnibbles/src/Makefile.am
+++ b/gnibbles/src/Makefile.am
@@ -33,6 +33,7 @@ gnibbles_CPPFLAGS = \
 gnibbles_CFLAGS = \
 	-DDATA_DIRECTORY=\"$(datadir)/gnibbles\" \
 	-DSOUND_DIRECTORY=\"$(pkgdatadir)/sounds\" \
+	-DLOCALEDIR=\"$(datadir)/locale\" \
 	$(GTK_CFLAGS) \
 	$(CANBERRA_GTK_CFLAGS) \
 	$(CLUTTER_GTK_CFLAGS) \
diff --git a/gnibbles/src/main.c b/gnibbles/src/main.c
index 792c750..73ff5ab 100644
--- a/gnibbles/src/main.c
+++ b/gnibbles/src/main.c
@@ -891,6 +891,11 @@ main (int argc, char **argv)
   int i;
   GError *error = NULL;
 
+  setlocale (LC_ALL, "");
+  bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
+  bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
+  textdomain (GETTEXT_PACKAGE);
+
   games_scores_startup ();
 
   g_set_application_name (_("Nibbles"));
diff --git a/gnobots2/src/Makefile.am b/gnobots2/src/Makefile.am
index 709aeac..e578b19 100644
--- a/gnobots2/src/Makefile.am
+++ b/gnobots2/src/Makefile.am
@@ -41,6 +41,7 @@ gnobots2_CPPFLAGS = \
 gnobots2_CFLAGS = \
 	-DDATA_DIRECTORY=\"$(datadir)/gnobots2\" \
 	-DSOUND_DIRECTORY=\"$(pkgdatadir)/sounds\" \
+	-DLOCALEDIR=\"$(datadir)/locale\" \
 	$(GTK_CFLAGS) \
 	$(CANBERRA_GTK_CFLAGS) \
 	$(AM_CFLAGS)
diff --git a/gnobots2/src/gnobots.c b/gnobots2/src/gnobots.c
index af2db8f..fccff3c 100644
--- a/gnobots2/src/gnobots.c
+++ b/gnobots2/src/gnobots.c
@@ -143,6 +143,11 @@ main (int argc, char *argv[])
   gboolean retval;
   GError *error = NULL;
 
+  setlocale (LC_ALL, "");
+  bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
+  bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
+  textdomain (GETTEXT_PACKAGE);
+
   games_scores_startup ();
 
   gettimeofday (&tv, NULL);
diff --git a/gnomine/src/Makefile.am b/gnomine/src/Makefile.am
index 14ec8a2..836b662 100644
--- a/gnomine/src/Makefile.am
+++ b/gnomine/src/Makefile.am
@@ -11,6 +11,7 @@ gnomine_CFLAGS = \
 	-DVERSION=\"$(VERSION)\" \
 	-DGETTEXT_PACKAGE=\"$(GETTEXT_PACKAGE)\" \
 	-DDATA_DIRECTORY=\"$(datadir)/gnomine\" \
+	-DLOCALEDIR=\"$(datadir)/locale\" \
 	$(GTK_CFLAGS)
 
 gnomine_VALAFLAGS = \
diff --git a/gnomine/src/config.vapi b/gnomine/src/config.vapi
index c0c89fc..8efa3e5 100644
--- a/gnomine/src/config.vapi
+++ b/gnomine/src/config.vapi
@@ -1,3 +1,4 @@
 public const string VERSION;
 public const string GETTEXT_PACKAGE;
 public const string DATA_DIRECTORY;
+public const string LOCALEDIR;
diff --git a/gnomine/src/gnomine.vala b/gnomine/src/gnomine.vala
index 1ce8b96..5a61626 100644
--- a/gnomine/src/gnomine.vala
+++ b/gnomine/src/gnomine.vala
@@ -768,6 +768,11 @@ public class GnoMine : Gtk.Application
 
     public static int main (string[] args)
     {
+        Intl.setlocale (LocaleCategory.ALL, "");
+        Intl.bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
+        Intl.bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
+        Intl.textdomain (GETTEXT_PACKAGE);
+
         GnomeGamesSupport.scores_startup ();
 
         var context = new OptionContext ("");
diff --git a/gnotravex/src/Makefile.am b/gnotravex/src/Makefile.am
index 9afbc33..4eb05d9 100644
--- a/gnotravex/src/Makefile.am
+++ b/gnotravex/src/Makefile.am
@@ -18,6 +18,7 @@ gnotravex_CFLAGS = \
 	-I$(top_srcdir)/libgames-support \
 	-DVERSION=\"$(VERSION)\" \
 	-DGETTEXT_PACKAGE=\"$(GETTEXT_PACKAGE)\" \
+	-DLOCALEDIR=\"$(datadir)/locale\" \
 	$(GTK_CFLAGS)	\
 	$(AM_CFLAGS)	\
 	-Wno-unused
diff --git a/gnotravex/src/config.vapi b/gnotravex/src/config.vapi
index 6477226..2e68d61 100644
--- a/gnotravex/src/config.vapi
+++ b/gnotravex/src/config.vapi
@@ -1,2 +1,3 @@
 public const string VERSION;
-public const string GETTEXT_PACKAGE;
\ No newline at end of file
+public const string GETTEXT_PACKAGE;
+public const string LOCALEDIR;
diff --git a/gnotravex/src/gnotravex.vala b/gnotravex/src/gnotravex.vala
index 4f4a643..522f7b7 100644
--- a/gnotravex/src/gnotravex.vala
+++ b/gnotravex/src/gnotravex.vala
@@ -330,6 +330,11 @@ public class Gnotravex : Gtk3.Application
 
     public static int main (string[] args)
     {
+        Intl.setlocale (LocaleCategory.ALL, "");
+        Intl.bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
+        Intl.bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
+        Intl.textdomain (GETTEXT_PACKAGE);
+
         GnomeGamesSupport.scores_startup ();
         var app = new Gnotravex ();
         return app.run (args);
diff --git a/gnotski/src/Makefile.am b/gnotski/src/Makefile.am
index f8378c0..c11f576 100644
--- a/gnotski/src/Makefile.am
+++ b/gnotski/src/Makefile.am
@@ -10,9 +10,10 @@ gnotski_CPPFLAGS = \
 
 gnotski_CFLAGS = \
 	-DDATA_DIRECTORY=\"$(datadir)/gnotski\" \
+	-DLOCALEDIR=\"$(datadir)/locale\" \
 	$(GTK_CFLAGS)	\
 	$(AM_CFLAGS)
-		
+
 gnotski_LDADD = \
 	$(top_builddir)/libgames-support/libgames-support.la \
 	$(GTK_LIBS)	\
diff --git a/gnotski/src/gnotski.c b/gnotski/src/gnotski.c
index dbb4ab6..f27ad8e 100644
--- a/gnotski/src/gnotski.c
+++ b/gnotski/src/gnotski.c
@@ -459,6 +459,11 @@ main (int argc, char **argv)
   gboolean retval;
   GError *error = NULL;
 
+  setlocale (LC_ALL, "");
+  bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
+  bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
+  textdomain (GETTEXT_PACKAGE);
+
   games_scores_startup ();
 
   context = g_option_context_new (NULL);
diff --git a/gtali/src/Makefile.am b/gtali/src/Makefile.am
index 74641ab..4df0ac6 100644
--- a/gtali/src/Makefile.am
+++ b/gtali/src/Makefile.am
@@ -15,6 +15,7 @@ gtali_CPPFLAGS = \
 
 gtali_CFLAGS = \
 	-DDATA_DIRECTORY=\"$(datadir)/gtali\" \
+	-DLOCALEDIR=\"$(datadir)/locale\" \
 	$(GTK_CFLAGS)	\
 	$(AM_CFLAGS)
 		
diff --git a/gtali/src/gyahtzee.c b/gtali/src/gyahtzee.c
index 1c2c59c..f3ce092 100644
--- a/gtali/src/gyahtzee.c
+++ b/gtali/src/gyahtzee.c
@@ -878,6 +878,11 @@ main (int argc, char *argv[])
   gboolean retval;
   GError *error = NULL;
 
+  setlocale (LC_ALL, "");
+  bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
+  bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
+  textdomain (GETTEXT_PACKAGE);
+
   games_scores_startup ();
 
   /* Reset all yahtzee variables before parsing args */
diff --git a/iagno/src/Makefile.am b/iagno/src/Makefile.am
index 2919800..666f780 100644
--- a/iagno/src/Makefile.am
+++ b/iagno/src/Makefile.am
@@ -13,6 +13,7 @@ iagno_CFLAGS = \
 	-DGETTEXT_PACKAGE=\"$(GETTEXT_PACKAGE)\" \
 	-DDATA_DIRECTORY=\"$(datadir)/iagno\" \
 	-DSOUND_DIRECTORY=\"$(pkgdatadir)/sounds\" \
+	-DLOCALEDIR=\"$(datadir)/locale\" \
 	$(GTK_CFLAGS) \
 	$(CANBERRA_GTK_CFLAGS)
 
diff --git a/iagno/src/config.vapi b/iagno/src/config.vapi
index e90b1fe..3e558f2 100644
--- a/iagno/src/config.vapi
+++ b/iagno/src/config.vapi
@@ -2,3 +2,4 @@ public const string VERSION;
 public const string GETTEXT_PACKAGE;
 public const string DATA_DIRECTORY;
 public const string SOUND_DIRECTORY;
+public const string LOCALEDIR;
diff --git a/iagno/src/iagno.vala b/iagno/src/iagno.vala
index dfc5a84..9f085c2 100644
--- a/iagno/src/iagno.vala
+++ b/iagno/src/iagno.vala
@@ -582,6 +582,11 @@ public class Iagno : Gtk.Application
 
     public static int main (string[] args)
     {
+        Intl.setlocale (LocaleCategory.ALL, "");
+        Intl.bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
+        Intl.bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
+        Intl.textdomain (GETTEXT_PACKAGE);
+
         var context = new OptionContext ("");
         context.set_translation_domain (GETTEXT_PACKAGE);
         context.add_group (Gtk.get_option_group (true));
diff --git a/lightsoff/src/Makefile.am b/lightsoff/src/Makefile.am
index 07a7695..b842d89 100644
--- a/lightsoff/src/Makefile.am
+++ b/lightsoff/src/Makefile.am
@@ -21,6 +21,7 @@ lightsoff_CFLAGS = \
 	-DVERSION=\"$(VERSION)\" \
 	-DGETTEXT_PACKAGE=\"$(GETTEXT_PACKAGE)\" \
 	-DPKGDATADIR=\""$(pkgdatadir)/lightsoff"\" \
+	-DLOCALEDIR=\"$(datadir)/locale\" \
 	$(GHTREAD_CFLAGS) \
 	$(GMODULE_CFLAGS) \
 	$(GTK_CFLAGS) \
diff --git a/lightsoff/src/config.vapi b/lightsoff/src/config.vapi
index f697a31..19e8616 100644
--- a/lightsoff/src/config.vapi
+++ b/lightsoff/src/config.vapi
@@ -4,4 +4,5 @@ namespace Config
   public const string PKGDATADIR;
   public const string GETTEXT_PACKAGE;
   public const string VERSION;
+  public const string LOCALEDIR;
 }
diff --git a/lightsoff/src/lightsoff.vala b/lightsoff/src/lightsoff.vala
index 1ce124a..a0dd300 100644
--- a/lightsoff/src/lightsoff.vala
+++ b/lightsoff/src/lightsoff.vala
@@ -150,6 +150,11 @@ public class LightsOff : Gtk.Application
 
     public static int main (string[] args)
     {
+        Intl.setlocale (LocaleCategory.ALL, "");
+        Intl.bindtextdomain (Config.GETTEXT_PACKAGE, Config.LOCALEDIR);
+        Intl.bind_textdomain_codeset (Config.GETTEXT_PACKAGE, "UTF-8");
+        Intl.textdomain (Config.GETTEXT_PACKAGE);
+
         Environment.set_prgname ("lightsoff");
 
         if (GtkClutter.init (ref args) != Clutter.InitError.SUCCESS)
diff --git a/mahjongg/src/Makefile.am b/mahjongg/src/Makefile.am
index 98e5f6a..b05ff08 100644
--- a/mahjongg/src/Makefile.am
+++ b/mahjongg/src/Makefile.am
@@ -18,6 +18,7 @@ mahjongg_CFLAGS = \
 	-DVERSION=\"$(VERSION)\" \
 	-DGETTEXT_PACKAGE=\"$(GETTEXT_PACKAGE)\" \
 	-DDATA_DIRECTORY=\"$(datadir)/mahjongg\" \
+	-DLOCALEDIR=\"$(datadir)/locale\" \
 	$(GTK_CFLAGS)
 
 mahjongg_LDADD = \
diff --git a/mahjongg/src/config.vapi b/mahjongg/src/config.vapi
index c0c89fc..8efa3e5 100644
--- a/mahjongg/src/config.vapi
+++ b/mahjongg/src/config.vapi
@@ -1,3 +1,4 @@
 public const string VERSION;
 public const string GETTEXT_PACKAGE;
 public const string DATA_DIRECTORY;
+public const string LOCALEDIR;
diff --git a/mahjongg/src/mahjongg.vala b/mahjongg/src/mahjongg.vala
index 06c8bd4..13a1250 100644
--- a/mahjongg/src/mahjongg.vala
+++ b/mahjongg/src/mahjongg.vala
@@ -771,6 +771,11 @@ public class Mahjongg : Gtk.Application
 
     public static int main (string[] args)
     {
+        Intl.setlocale (LocaleCategory.ALL, "");
+        Intl.bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
+        Intl.bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
+        Intl.textdomain (GETTEXT_PACKAGE);
+
         GnomeGamesSupport.scores_startup ();
 
         Gtk.init (ref args);
diff --git a/quadrapassel/src/Makefile.am b/quadrapassel/src/Makefile.am
index f860056..32fc56d 100644
--- a/quadrapassel/src/Makefile.am
+++ b/quadrapassel/src/Makefile.am
@@ -28,6 +28,7 @@ quadrapassel_CPPFLAGS = \
 quadrapassel_CXXFLAGS = \
 	-DDATA_DIRECTORY=\"$(datadir)/quadrapassel\" \
 	-DSOUND_DIRECTORY=\"$(pkgdatadir)/sounds\" \
+	-DLOCALEDIR=\"$(datadir)/locale\" \
 	$(GTK_CFLAGS) \
 	$(CANBERRA_GTK_CFLAGS) \
 	$(CLUTTER_GTK_CFLAGS) \
diff --git a/quadrapassel/src/main.cpp b/quadrapassel/src/main.cpp
index a1a1591..a17dc03 100644
--- a/quadrapassel/src/main.cpp
+++ b/quadrapassel/src/main.cpp
@@ -21,6 +21,7 @@
 
 #include <config.h>
 
+#include <locale.h>
 #include <libgames-support/games-scores.h>
 #include <clutter-gtk/clutter-gtk.h>
 
@@ -32,6 +33,11 @@ main(int argc, char *argv[])
 	gboolean retval;
 	GError *error = NULL;
 
+	setlocale (LC_ALL, "");
+	bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
+	bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
+	textdomain (GETTEXT_PACKAGE);
+
     games_scores_startup ();
 
 	int cmdlineLevel = 0;
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]