Bug 334385 – Use intltool

2006-03-15  Behdad Esfahbod  <behdad@gnome.org>

        Bug 334385 – Use intltool

        * Makefile.am, configure.in: Add intltool support.

        * src/iso2022.c, src/reaper.c, src/vteaccess.c, src/vteapp.c,
        src/vtebg.c, src/vtexft.c, src/vte.c: Include glib/gi18n-lib.h
        instead of #ifdefing gettext stuff.

        * src/vte.c (vte_terminal_class_init): Use GETTEXT_PACKAGE instead
        of PACKAGE in bindgettextdomain.

diff --git a/ChangeLog b/ChangeLog
index f07c000..4a8ff96 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2006-03-15  Behdad Esfahbod  <behdad@gnome.org>
+
+       Bug 334385 – Use intltool
+
+       * Makefile.am, configure.in: Add intltool support.
+
+       * src/iso2022.c, src/reaper.c, src/vteaccess.c, src/vteapp.c,
+       src/vtebg.c, src/vtexft.c, src/vte.c: Include glib/gi18n-lib.h
+       instead of #ifdefing gettext stuff.
+
+       * src/vte.c (vte_terminal_class_init): Use GETTEXT_PACKAGE instead
+       of PACKAGE in bindgettextdomain.
+
 2006-03-14  Behdad Esfahbod  <behdad@gnome.org>
 
        * src/vte.c (vte_terminal_size_allocate): More tweaks to the

diff --git a/Makefile.am b/Makefile.am
index d5cc753..34d7bd4 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,8 @@
 SUBDIRS = src python termcaps po doc
-EXTRA_DIST = MAINTAINERS HACKING vte.spec vte.pc.in vte-uninstalled.pc.in
+EXTRA_DIST = MAINTAINERS HACKING vte.spec vte.pc.in vte-uninstalled.pc.in \
+            intltool-extract.in intltool-merge.in intltool-update.in
+DISTCLEANFILES = intltool-extract intltool-merge intltool-update
+
 if BUILD_GNOME_PTY_HELPER
 SUBDIRS += gnome-pty-helper
 endif

diff --git a/configure.in b/configure.in
index c0ebb74..ce25de2 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -12,8 +12,14 @@ AM_PROG_CC_STDC
 AM_MAINTAINER_MODE
 
 AM_PROG_LIBTOOL
+
 ALL_LINGUAS="am ang ar az be bg bn bs ca cs cy da de el en_CA en_GB es et eu fa fi fr ga gl gu he hi hr hu id is it ja ka kn ko ku ky li lt lv mi mk ml mn ms nb ne nl nn no or pa pl pt pt_BR ro ru rw sk sl sq sr sr@Latn sv ta th tr ug uk vi wa xh zh_CN zh_HK zh_TW"
 
+AC_PROG_INTLTOOL([0.31])
+GETTEXT_PACKAGE=vte
+AC_SUBST(GETTEXT_PACKAGE)
+AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE",
+                   [Package translatable messages domain name.])
 AM_GLIB_GNU_GETTEXT
 AC_CHECK_DECLS(bind_textdomain_codeset,,,[#include "libintl.h"])
 
@@ -425,9 +431,6 @@ AC_DEFINE_UNQUOTED(DATADIR,"$mydatadir",
 AC_DEFINE_UNQUOTED(LOCALEDIR,"$mydatadir/locale",
                    [The location where locale data can be found.])
 
-GETTEXT_PACKAGE=vte
-AC_SUBST(GETTEXT_PACKAGE)
-
 AC_ARG_ENABLE(gnome-pty-helper, [AS_HELP_STRING(--enable-gnome-pty-helper,Build a setuid helper for opening ptys [default=yes])], enable_gnome_pty_helper="$enableval", enable_gnome_pty_helper=yes)
 if test "$enable_gnome_pty_helper" != no; then
        AC_DEFINE(VTE_USE_GNOME_PTY_HELPER,1,[Define if you intend to use gnome-pty-helper.])

diff --git a/src/iso2022.c b/src/iso2022.c
index 2645e6e..27c5935 100644 (file)
--- a/src/iso2022.c
+++ b/src/iso2022.c
@@ -35,14 +35,7 @@
 #ifdef HAVE_LOCALE_H
 #include <locale.h>
 #endif
-
-#ifdef ENABLE_NLS
-#include <libintl.h>
-#define _(String) dgettext(PACKAGE, String)
-#else
-#define _(String) String
-#define bindtextdomain(package,dir)
-#endif
+#include <glib/gi18n-lib.h>
 
 /* Maps which jive with XTerm's ESC ()*+ ? sequences, RFC 1468.  Add the
  * PC437 map because despite knowing that XTerm doesn't support it, certain

diff --git a/src/reaper.c b/src/reaper.c
index 5c27752..d2a04dd 100644 (file)
--- a/src/reaper.c
+++ b/src/reaper.c
@@ -33,16 +33,8 @@
 
 #ifdef HAVE_LOCALE_H
 #include <locale.h>
-#else
-#define bindtextdomain(package,dir)
-#endif
-
-#ifdef ENABLE_NLS
-#include <libintl.h>
-#define _(String) dgettext(PACKAGE, String)
-#else
-#define _(String) String
 #endif
+#include <glib/gi18n-lib.h>
 
 static VteReaper *singleton_reaper = NULL;
 struct reaper_info {

diff --git a/src/vte.c b/src/vte.c
index 30ee451..f7e9fc7 100644 (file)
--- a/src/vte.c
+++ b/src/vte.c
@@ -47,6 +47,7 @@
 #ifdef HAVE_LOCALE_H
 #include <locale.h>
 #endif
+#include <glib/gi18n-lib.h>
 
 #ifndef HAVE_WINT_T
 typedef gunichar wint_t;
@@ -9518,7 +9519,7 @@ vte_terminal_class_init(VteTerminalClass *klass, gconstpointer data)
        }
 #endif
 
-       bindtextdomain(PACKAGE, LOCALEDIR);
+       bindtextdomain(GETTEXT_PACKAGE, LOCALEDIR);
 #ifdef HAVE_DECL_BIND_TEXTDOMAIN_CODESET
        bind_textdomain_codeset(PACKAGE, "UTF-8");
 #endif

diff --git a/src/vteaccess.c b/src/vteaccess.c
index e9fc0b1..61acd05 100644 (file)
--- a/src/vteaccess.c
+++ b/src/vteaccess.c
@@ -34,12 +34,7 @@
 #ifdef HAVE_LOCALE_H
 #include <locale.h>
 #endif
-
-#ifdef ENABLE_NLS
-#include <libintl.h>
-#else
-#define bindtextdomain(package,dir)
-#endif
+#include <glib/gi18n-lib.h>
 
 #define VTE_TERMINAL_ACCESSIBLE_PRIVATE_DATA "VteTerminalAccessiblePrivateData"
 

diff --git a/src/vteapp.c b/src/vteapp.c
index 70ca538..a44bc6d 100644 (file)
--- a/src/vteapp.c
+++ b/src/vteapp.c
@@ -34,13 +34,7 @@
 #include "debug.h"
 #include "vte.h"
 
-#ifdef ENABLE_NLS
-#include <libintl.h>
-#define _(String) dgettext(PACKAGE, String)
-#else
-#define _(String) String
-#define bindtextdomain(package,dir)
-#endif
+#include <glib/gi18n-lib.h>
 
 #define DINGUS1 "(((news|telnet|nttp|file|http|ftp|https)://)|(www|ftp)[-A-Za-z0-9]*\\.)[-A-Za-z0-9\\.]+(:[0-9]*)?"
 #define DINGUS2 "(((news|telnet|nttp|file|http|ftp|https)://)|(www|ftp)[-A-Za-z0-9]*\\.)[-A-Za-z0-9\\.]+(:[0-9]*)?/[-A-Za-z0-9_\\$\\.\\+\\!\\*\\(\\),;:@&=\\?/~\\#\\%]*[^]'\\.}>\\) ,\\\"]"

diff --git a/src/vtebg.c b/src/vtebg.c
index 0370887..20781e6 100644 (file)
--- a/src/vtebg.c
+++ b/src/vtebg.c
@@ -25,13 +25,7 @@
 #include "marshal.h"
 #include "vtebg.h"
 
-#ifdef ENABLE_NLS
-#include <libintl.h>
-#define _(String) dgettext(PACKAGE, String)
-#else
-#define _(String) String
-#define bindtextdomain(package,dir)
-#endif
+#include <glib/gi18n-lib.h>
 
 struct VteBgPrivate {
        GList *cache;

diff --git a/src/vtexft.c b/src/vtexft.c
index 001c5ab..12a5e22 100644 (file)
--- a/src/vtexft.c
+++ b/src/vtexft.c
@@ -37,13 +37,7 @@
 #include "vtexft.h"
 #include "vtetree.h"
 
-#ifdef ENABLE_NLS
-#include <libintl.h>
-#define _(String) dgettext(PACKAGE, String)
-#else
-#define _(String) String
-#define bindtextdomain(package,dir)
-#endif
+#include <glib/gi18n-lib.h>
 
 #define FONT_INDEX_FUDGE 10
 #define CHAR_WIDTH_FUDGE 10