GNOME.org
 

[easytag] Fix localization by defining ENABLE_NLS correctly

commit 1efaee2f5d810f8ee8dec70a4cb3d0ac178f5847
Author: David King <amigadave amigadave com>
Date:   Thu Nov 14 08:13:42 2013 +0000

    Fix localization by defining ENABLE_NLS correctly
    
    Since the switch to use intltool and not gettext in commit
    98065d10b09bb27a2dee1e79f9b0eef0cee549a0, localization hsa been broken,
    as ENABLE_NLS is not defined by IT_PROG_INTLTOOL but is used in an ifdef
    in main().
    
    Additionally, includes of <glib/gi18n-lib.h> were corrected to
    <glib/gi18n.h>. Finally, gtk_action_group_set_translation_domain() was
    set on action groups, to ensure translations of actions.
    
    Fixes bug 712250.

 configure.ac             |    2 ++
 src/about.c              |    2 +-
 src/ape_tag.c            |    2 +-
 src/bar.c                |    3 ++-
 src/browser.c            |    2 +-
 src/cddb.c               |    2 +-
 src/charset.c            |    2 +-
 src/easytag.c            |    2 +-
 src/et_core.c            |    2 +-
 src/flac_header.c        |    2 +-
 src/flac_tag.c           |    2 +-
 src/id3_tag.c            |    2 +-
 src/id3v24_tag.c         |    2 +-
 src/log.c                |    2 +-
 src/misc.c               |    2 +-
 src/monkeyaudio_header.c |    2 +-
 src/mp4_header.c         |    2 +-
 src/mp4_tag.c            |    2 +-
 src/mpeg_header.c        |    2 +-
 src/musepack_header.c    |    2 +-
 src/ogg_header.c         |    2 +-
 src/ogg_tag.c            |    2 +-
 src/picture.c            |    2 +-
 src/prefs.c              |    2 +-
 src/scan.c               |    2 +-
 src/setting.c            |    2 +-
 src/vcedit.c             |    2 +-
 src/wavpack_header.c     |    2 +-
 src/wavpack_tag.c        |    2 +-
 29 files changed, 31 insertions(+), 28 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 5a2248a..e8e5c82 100644
--- a/configure.ac
+++ b/configure.ac
@@ -24,6 +24,8 @@ dnl -------------------------------
 IT_PROG_INTLTOOL([0.50.0])
 AC_SUBST([GETTEXT_PACKAGE], [$PACKAGE_TARNAME])
 AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE], ["$GETTEXT_PACKAGE"], [Package name for gettext])
+AS_IF([test "x$USE_NLS" != "x"],
+      [AC_DEFINE([ENABLE_NLS], [1], [Native Language support is enabled])])
 
 dnl -------------------------------
 dnl Checks for programs.
diff --git a/src/about.c b/src/about.c
index 3e26616..9f3663f 100644
--- a/src/about.c
+++ b/src/about.c
@@ -21,7 +21,7 @@
 #include "config.h"
 
 #include <gtk/gtk.h>
-#include <glib/gi18n-lib.h>
+#include <glib/gi18n.h>
 
 #include "about.h"
 #include "easytag.h"
diff --git a/src/ape_tag.c b/src/ape_tag.c
index 7cc3a2e..f089165 100644
--- a/src/ape_tag.c
+++ b/src/ape_tag.c
@@ -22,7 +22,7 @@
 #include <config.h>
 
 #include <gtk/gtk.h>
-#include <glib/gi18n-lib.h>
+#include <glib/gi18n.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/src/bar.c b/src/bar.c
index a377c89..1fe4f5d 100644
--- a/src/bar.c
+++ b/src/bar.c
@@ -21,7 +21,7 @@
 #include <config.h>
 
 #include <gtk/gtk.h>
-#include <glib/gi18n-lib.h>
+#include <glib/gi18n.h>
 
 #include "bar.h"
 #include "easytag.h"
@@ -399,6 +399,7 @@ void Create_UI (GtkWidget **ppmenubar, GtkWidget **pptoolbar)
 
     /* UI Management */
     ActionGroup = gtk_action_group_new("actions");
+    gtk_action_group_set_translation_domain (ActionGroup, GETTEXT_PACKAGE);
     gtk_action_group_add_actions(ActionGroup, ActionEntries, num_menu_entries, NULL);
     gtk_action_group_add_toggle_actions(ActionGroup, ToggleActionEntries, num_toggle_entries, NULL);
     gtk_action_group_add_radio_actions (ActionGroup, view_mode_entries,
diff --git a/src/browser.c b/src/browser.c
index 50846be..28783ff 100644
--- a/src/browser.c
+++ b/src/browser.c
@@ -30,7 +30,7 @@
 #include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
 #include <gdk/gdk.h>
-#include <glib/gi18n-lib.h>
+#include <glib/gi18n.h>
 #include <sys/stat.h>
 #include <unistd.h>
 #include <stdlib.h>
diff --git a/src/cddb.c b/src/cddb.c
index 599b715..56366d3 100644
--- a/src/cddb.c
+++ b/src/cddb.c
@@ -22,7 +22,7 @@
 
 #include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
-#include <glib/gi18n-lib.h>
+#include <glib/gi18n.h>
 #include <stdio.h>
 #include <unistd.h>
 #include <string.h>
diff --git a/src/charset.c b/src/charset.c
index 7c82e80..09ded37 100644
--- a/src/charset.c
+++ b/src/charset.c
@@ -25,7 +25,7 @@
 #include <glib.h>
 #include <string.h>
 #include <errno.h>
-#include <glib/gi18n-lib.h>
+#include <glib/gi18n.h>
 
 #ifdef HAVE_LANGINFO_CODESET
 #include <langinfo.h>
diff --git a/src/easytag.c b/src/easytag.c
index 7d9d983..9e3b5c0 100644
--- a/src/easytag.c
+++ b/src/easytag.c
@@ -24,7 +24,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <gdk/gdkkeysyms.h>
-#include <glib/gi18n-lib.h>
+#include <glib/gi18n.h>
 #include <stdlib.h>
 #include <sys/stat.h>
 #include <unistd.h>
diff --git a/src/et_core.c b/src/et_core.c
index 8e6f676..3ba6191 100644
--- a/src/et_core.c
+++ b/src/et_core.c
@@ -21,7 +21,7 @@
 #include <config.h>
 
 #include <gtk/gtk.h>
-#include <glib/gi18n-lib.h>
+#include <glib/gi18n.h>
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
diff --git a/src/flac_header.c b/src/flac_header.c
index 708bfeb..996a3f1 100644
--- a/src/flac_header.c
+++ b/src/flac_header.c
@@ -30,7 +30,7 @@
 #ifdef ENABLE_FLAC
 
 #include <gtk/gtk.h>
-#include <glib/gi18n-lib.h>
+#include <glib/gi18n.h>
 #include <FLAC/all.h>
 
 #include "easytag.h"
diff --git a/src/flac_tag.c b/src/flac_tag.c
index f78772b..2bbfa4c 100644
--- a/src/flac_tag.c
+++ b/src/flac_tag.c
@@ -24,7 +24,7 @@
 #ifdef ENABLE_FLAC
 
 #include <gtk/gtk.h>
-#include <glib/gi18n-lib.h>
+#include <glib/gi18n.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/src/id3_tag.c b/src/id3_tag.c
index 7cf8bc0..f6e8abf 100644
--- a/src/id3_tag.c
+++ b/src/id3_tag.c
@@ -21,7 +21,7 @@
 #include "config.h"
 
 #include <gtk/gtk.h>
-#include <glib/gi18n-lib.h>
+#include <glib/gi18n.h>
 #include <stdio.h>
 #include <errno.h>
 #include <string.h>
diff --git a/src/id3v24_tag.c b/src/id3v24_tag.c
index 5eb52d7..c02d08c 100644
--- a/src/id3v24_tag.c
+++ b/src/id3v24_tag.c
@@ -22,7 +22,7 @@
 #include <config.h>
 
 #include <gtk/gtk.h>
-#include <glib/gi18n-lib.h>
+#include <glib/gi18n.h>
 #include <fcntl.h>
 #include <stdio.h>
 #include <errno.h>
diff --git a/src/log.c b/src/log.c
index 7be6785..577fb63 100644
--- a/src/log.c
+++ b/src/log.c
@@ -20,7 +20,7 @@
 
 #include <config.h>
 
-#include <glib/gi18n-lib.h>
+#include <glib/gi18n.h>
 #include <errno.h>
 #include <string.h>
 #include <stdio.h>
diff --git a/src/misc.c b/src/misc.c
index 7d66458..7bc79d4 100644
--- a/src/misc.c
+++ b/src/misc.c
@@ -22,7 +22,7 @@
 
 #include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
-#include <glib/gi18n-lib.h>
+#include <glib/gi18n.h>
 #include <ctype.h>
 #include <sys/stat.h>
 #include <errno.h>
diff --git a/src/monkeyaudio_header.c b/src/monkeyaudio_header.c
index 397d9c2..04bce1f 100644
--- a/src/monkeyaudio_header.c
+++ b/src/monkeyaudio_header.c
@@ -22,7 +22,7 @@
 #include <config.h>
 
 #include <gtk/gtk.h>
-#include <glib/gi18n-lib.h>
+#include <glib/gi18n.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/src/mp4_header.c b/src/mp4_header.c
index 34a1d57..b6bedb7 100644
--- a/src/mp4_header.c
+++ b/src/mp4_header.c
@@ -24,7 +24,7 @@
 #ifdef ENABLE_MP4
 
 #include <gtk/gtk.h>
-#include <glib/gi18n-lib.h>
+#include <glib/gi18n.h>
 #include <stdio.h>
 #include <errno.h>
 #include <unistd.h>
diff --git a/src/mp4_tag.c b/src/mp4_tag.c
index c0e3590..fa047de 100644
--- a/src/mp4_tag.c
+++ b/src/mp4_tag.c
@@ -25,7 +25,7 @@
 #ifdef ENABLE_MP4
 
 #include <gtk/gtk.h>
-#include <glib/gi18n-lib.h>
+#include <glib/gi18n.h>
 #include <stdlib.h>
 
 #include "mp4_tag.h"
diff --git a/src/mpeg_header.c b/src/mpeg_header.c
index c2e18d0..66af6f7 100644
--- a/src/mpeg_header.c
+++ b/src/mpeg_header.c
@@ -23,7 +23,7 @@
 #if defined ENABLE_MP3 && defined ENABLE_ID3LIB
 
 #include <gtk/gtk.h>
-#include <glib/gi18n-lib.h>
+#include <glib/gi18n.h>
 
 #include "mpeg_header.h"
 #include "easytag.h"
diff --git a/src/musepack_header.c b/src/musepack_header.c
index 3c770bc..339e85e 100644
--- a/src/musepack_header.c
+++ b/src/musepack_header.c
@@ -22,7 +22,7 @@
 #include <config.h>
 
 #include <gtk/gtk.h>
-#include <glib/gi18n-lib.h>
+#include <glib/gi18n.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/src/ogg_header.c b/src/ogg_header.c
index 065e80b..451d269 100644
--- a/src/ogg_header.c
+++ b/src/ogg_header.c
@@ -23,7 +23,7 @@
 #ifdef ENABLE_OGG
 
 #include <gtk/gtk.h>
-#include <glib/gi18n-lib.h>
+#include <glib/gi18n.h>
 #include <errno.h>
 #include <vorbis/codec.h>
 #include <vorbis/vorbisfile.h>
diff --git a/src/ogg_tag.c b/src/ogg_tag.c
index 2b17d03..6e28bde 100644
--- a/src/ogg_tag.c
+++ b/src/ogg_tag.c
@@ -23,7 +23,7 @@
 #ifdef ENABLE_OGG
 
 #include <gtk/gtk.h>
-#include <glib/gi18n-lib.h>
+#include <glib/gi18n.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/src/picture.c b/src/picture.c
index e7709c9..557fadb 100644
--- a/src/picture.c
+++ b/src/picture.c
@@ -23,7 +23,7 @@
 #include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
 #include <gdk/gdk.h>
-#include <glib/gi18n-lib.h>
+#include <glib/gi18n.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
diff --git a/src/prefs.c b/src/prefs.c
index 1922080..b939ef0 100644
--- a/src/prefs.c
+++ b/src/prefs.c
@@ -25,7 +25,7 @@
 #include <stdlib.h>
 #include <gdk/gdkkeysyms.h>
 #include <gdk/gdk.h>
-#include <glib/gi18n-lib.h>
+#include <glib/gi18n.h>
 #include <stdio.h>
 #include <string.h>
 #include <sys/stat.h>
diff --git a/src/scan.c b/src/scan.c
index 3f3bc38..081be4f 100644
--- a/src/scan.c
+++ b/src/scan.c
@@ -25,7 +25,7 @@
 #include <stdlib.h>
 #include <gdk/gdkkeysyms.h>
 #include <config.h>
-#include <glib/gi18n-lib.h>
+#include <glib/gi18n.h>
 
 #include "gtk2_compat.h"
 #include "scan.h"
diff --git a/src/setting.c b/src/setting.c
index b0f3868..1186b4f 100644
--- a/src/setting.c
+++ b/src/setting.c
@@ -21,7 +21,7 @@
 #include <config.h>
 
 #include <gtk/gtk.h>
-#include <glib/gi18n-lib.h>
+#include <glib/gi18n.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
diff --git a/src/vcedit.c b/src/vcedit.c
index 55bcf30..12e7b00 100644
--- a/src/vcedit.c
+++ b/src/vcedit.c
@@ -13,7 +13,7 @@
 
 #ifdef ENABLE_OGG
 #include <gio/gio.h>
-#include <glib/gi18n-lib.h>
+#include <glib/gi18n.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/src/wavpack_header.c b/src/wavpack_header.c
index a7c4d7f..61da89e 100644
--- a/src/wavpack_header.c
+++ b/src/wavpack_header.c
@@ -23,7 +23,7 @@
 #ifdef ENABLE_WAVPACK
 
 #include <gtk/gtk.h>
-#include <glib/gi18n-lib.h>
+#include <glib/gi18n.h>
 #include <stdio.h>
 #include <errno.h>
 #include <string.h>
diff --git a/src/wavpack_tag.c b/src/wavpack_tag.c
index 43f1b86..61cc076 100644
--- a/src/wavpack_tag.c
+++ b/src/wavpack_tag.c
@@ -23,7 +23,7 @@
 #ifdef ENABLE_WAVPACK
 
 #include <gtk/gtk.h>
-#include <glib/gi18n-lib.h>
+#include <glib/gi18n.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]