Use GNU gettext only and drop references to intltool and glib-getttext

8 files changed, 100 insertions, 33 deletions

diff --git a/.gitignore b/.gitignore
index 761bf621..d6c7f429 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
 *.tar.xz
 *~
+ABOUT-NLS
 codeblocks.cbp
 codeblocks.layout
 INSTALL
@@ -7,6 +8,7 @@ Makefile
 Makefile.in
 aclocal.m4
 autom4te.cache
+build-aux
 compile
 config.guess
 config.h
@@ -20,26 +22,26 @@ depcomp
 install-sh
 stamp-h1
 mkinstalldirs
+po/*.gmo
+po/*.header
+po/*.pot
+po/*.sed
+po/*.sin
+po/Makefile.in.in
+po/Makevars.template
 po/POTFILES
-po/stamp-it
+po/Rules-quot
+po/stamp-po
 .deps
 .libs
 m4
 missing
 ltmain.sh
 libtool
-intltool-update.in
-intltool-merge.in
-intltool-extract.in
-po/Makefile.in.in
-po/.intltool-merge-cache
 src/*.c
-src/*.stamp
 datahub/*.c
-datahub/*.stamp
 datahub/zeitgeist-datahub
 examples/*.c
-examples/*.stamp
 src/zeitgeist
 src/bluebird
 test/direct/where-clause-test
@@ -48,13 +50,7 @@ query-operators-test
 data/org.gnome.zeitgeist.service
 data/zeitgeist-datahub.desktop
 extensions/*.c
-extensions/*.stamp
-extensions/*.la
-extensions/*.lo
 extensions/fts++/*.c
-extensions/fts++/*.stamp
-extensions/fts++/*.la
-extensions/fts++/*.lo
 extensions/fts++/zeitgeist-internal.*
 extensions/fts++/test/test-fts
 extensions/fts++/org.gnome.zeitgeist.fts.service
diff --git a/autogen.sh b/autogen.sh
index 634216fe..b49ccf1a 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -20,7 +20,6 @@ fi
 
 set -x
 aclocal --install || exit 1
-intltoolize --force --copy --automake || exit 1
 autoreconf --verbose --force --install -Wno-portability || exit 1
 set +x
 
diff --git a/configure.ac b/configure.ac
index f045edf2..abdf3e44 100644
--- a/configure.ac
+++ b/configure.ac
@@ -28,12 +28,11 @@ AS_IF([test -z "$VALAC"], [AC_MSG_ERROR(["No Vala compiler found."])])
 
 AM_SILENT_RULES([yes])
 
-AH_TEMPLATE([GETTEXT_PACKAGE], [Package name for gettext])
-GETTEXT_PACKAGE=zeitgeist
-AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE")
+GETTEXT_PACKAGE=AC_PACKAGE_NAME
 AC_SUBST(GETTEXT_PACKAGE)
-AM_GLIB_GNU_GETTEXT
-IT_PROG_INTLTOOL([0.35.0])
+AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, ["$GETTEXT_PACKAGE"], [Define the gettext package to be used])
+AM_GNU_GETTEXT_VERSION([0.19])
+AM_GNU_GETTEXT([external])
 
 AC_SUBST(CFLAGS)
 AC_SUBST(CPPFLAGS)
diff --git a/data/Makefile.am b/data/Makefile.am
index 16982272..5cedd84d 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -21,8 +21,6 @@ xdgautostartdir=$(sysconfdir)/xdg/autostart
 xdgautostart_DATA = $(xdgautostart_in_files:.desktop.in=.desktop)
 endif
 
-@INTLTOOL_DESKTOP_RULE@
-
 CLEANFILES = \
 	org.gnome.zeitgeist.service \
 	PythonSerializer.pyc \
@@ -37,5 +35,8 @@ EXTRA_DIST = \
 
 all-local: org.gnome.zeitgeist.service
 
+%.desktop: %.desktop.in
+	$(AM_V_GEN)$(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
+
 clean:
 	rm -rf *.pyc *.~[0-9]~
diff --git a/data/zeitgeist-datahub.desktop.in b/data/zeitgeist-datahub.desktop.in
index 30b4aac5..dfda7611 100644
--- a/data/zeitgeist-datahub.desktop.in
+++ b/data/zeitgeist-datahub.desktop.in
@@ -1,10 +1,6 @@
 [Desktop Entry]
-Version=1.0
-Encoding=UTF-8
-_Name=Zeitgeist Datahub
-_Comment=Start the Zeitgeist Datahub for passive loggers
+Name=Zeitgeist Datahub
+Comment=Start the Zeitgeist Datahub for passive loggers
 Exec=zeitgeist-datahub
 Terminal=false
 Type=Application
-Categories=
-GenericName=
diff --git a/po/Makevars b/po/Makevars
new file mode 100644
index 00000000..b852106a
--- /dev/null
+++ b/po/Makevars
@@ -0,0 +1,78 @@
+# Makefile variables for PO directory in any package using GNU gettext.
+
+# Usually the message domain is the same as the package name.
+DOMAIN = $(PACKAGE)
+
+# These two variables depend on the location of this directory.
+subdir = po
+top_builddir = ..
+
+# These options get passed to xgettext.
+XGETTEXT_OPTIONS = --from-code=UTF-8 --keyword=_ --keyword=N_
+
+# This is the copyright holder that gets inserted into the header of the
+# $(DOMAIN).pot file.  Set this to the copyright holder of the surrounding
+# package.  (Note that the msgstr strings, extracted from the package's
+# sources, belong to the copyright holder of the package.)  Translators are
+# expected to transfer the copyright for their translations to this person
+# or entity, or to disclaim their copyright.  The empty string stands for
+# the public domain; in this case the translators are expected to disclaim
+# their copyright.
+COPYRIGHT_HOLDER = The Zeitgeist Developers
+
+# This tells whether or not to prepend "GNU " prefix to the package
+# name that gets inserted into the header of the $(DOMAIN).pot file.
+# Possible values are "yes", "no", or empty.  If it is empty, try to
+# detect it automatically by scanning the files in $(top_srcdir) for
+# "GNU packagename" string.
+PACKAGE_GNU = no
+
+# This is the email address or URL to which the translators shall report
+# bugs in the untranslated strings:
+# - Strings which are not entire sentences, see the maintainer guidelines
+#   in the GNU gettext documentation, section 'Preparing Strings'.
+# - Strings which use unclear terms or require additional context to be
+#   understood.
+# - Strings which make invalid assumptions about notation of date, time or
+#   money.
+# - Pluralisation problems.
+# - Incorrect English spelling.
+# - Incorrect formatting.
+# It can be your email address, or a mailing list address where translators
+# can write to without being subscribed, or the URL of a web page through
+# which the translators can contact you.
+MSGID_BUGS_ADDRESS = https://bugs.freedesktop.org/enter_bug.cgi?product=Zeitgeist
+
+# This is the list of locale categories, beyond LC_MESSAGES, for which the
+# message catalogs shall be used.  It is usually empty.
+EXTRA_LOCALE_CATEGORIES =
+
+# This tells whether the $(DOMAIN).pot file contains messages with an 'msgctxt'
+# context.  Possible values are "yes" and "no".  Set this to yes if the
+# package uses functions taking also a message context, like pgettext(), or
+# if in $(XGETTEXT_OPTIONS) you define keywords with a context argument.
+USE_MSGCTXT = no
+
+# These options get passed to msgmerge.
+# Useful options are in particular:
+#   --previous            to keep previous msgids of translated messages,
+#   --quiet               to reduce the verbosity.
+MSGMERGE_OPTIONS =
+
+# These options get passed to msginit.
+# If you want to disable line wrapping when writing PO files, add
+# --no-wrap to MSGMERGE_OPTIONS, XGETTEXT_OPTIONS, and
+# MSGINIT_OPTIONS.
+MSGINIT_OPTIONS =
+
+# This tells whether or not to regenerate a PO file when $(DOMAIN).pot
+# has changed.  Possible values are "yes" and "no".  Set this to no if
+# the POT file is checked in the repository and the version control
+# program ignores timestamps.
+PO_DEPENDS_ON_POT = no
+
+# This tells whether or not to forcibly update $(DOMAIN).pot and
+# regenerate PO files on "make dist".  Possible values are "yes" and
+# "no".  Set this to no if the POT file and PO files are maintained
+# externally.
+DIST_DEPENDS_ON_UPDATE_PO = no
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 407684e9..d5fcaaca 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,6 +1,2 @@
-[encoding: UTF-8]
-# List of source files which contain translatable strings.
 data/zeitgeist-datahub.desktop.in
 src/zeitgeist-daemon.vala
-tools/zeitgeist-explorer/details.py
-tools/zeitgeist-explorer/ontology.py
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
index 1c1a9511..7aa32806 100644
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -1,2 +1,4 @@
 src/main.c
+tools/zeitgeist-explorer/details.py
+tools/zeitgeist-explorer/ontology.py
 tools/gtk/zeitgeist-data-sources-gtk.py