migrate from intltool to gettext

5 files changed, 85 insertions, 19 deletions

diff --git a/Makefile.am b/Makefile.am
index 7c04518..93bea52 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,24 +2,17 @@ if BUILD_TESTS
 TEST = test
 endif
 
-SUBDIRS = libmatekbd $(TEST) po
+SUBDIRS = po libmatekbd $(TEST)
 
 ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
 
 DISTCHECK_CONFIGURE_FLAGS = --enable-introspection
 
-DISTCLEANFILES = \
-  intltool-extract \
-  intltool-merge \
-  intltool-update
 
 EXTRA_DIST = \
         autogen.sh \
         libmatekbd.pc.in \
-        libmatekbdui.pc.in \
-        intltool-extract.in \
-        intltool-merge.in \
-        intltool-update.in
+        libmatekbdui.pc.in
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = libmatekbd.pc libmatekbdui.pc
@@ -33,4 +26,3 @@ ChangeLog:
 dist: ChangeLog
 
 .PHONY: ChangeLog
-
diff --git a/configure.ac b/configure.ac
index d850f48..9d88e77 100644
--- a/configure.ac
+++ b/configure.ac
@@ -42,10 +42,8 @@ GETTEXT_PACKAGE=libmatekbd
 AC_SUBST(GETTEXT_PACKAGE)
 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Gettext package])
 
-AM_GLIB_GNU_GETTEXT
-
-IT_PROG_INTLTOOL([0.50.1])
-
+AM_GNU_GETTEXT_VERSION([0.19.8])
+AM_GNU_GETTEXT([external])
 # *****************************************************************************
 
 AC_CHECK_FUNCS(setlocale)
diff --git a/libmatekbd/Makefile.am b/libmatekbd/Makefile.am
index 185834d..97f0bab 100644
--- a/libmatekbd/Makefile.am
+++ b/libmatekbd/Makefile.am
@@ -69,12 +69,9 @@ matekbdinc_HEADERS = \
                       matekbd-keyboard-drawing.h \
                       matekbd-util.h
 
-@INTLTOOL_DESKTOP_RULE@
-
 noinst_HEADERS = $(extra_nih) \
                  matekbd-config-private.h
 
-@INTLTOOL_XML_NOMERGE_RULE@
 gsettingsschema_in_files = org.mate.peripherals-keyboard-xkb.gschema.xml.in
 gsettings_SCHEMAS = $(gsettingsschema_in_files:.xml.in=.xml)
 @GSETTINGS_RULES@
diff --git a/po/Makevars b/po/Makevars
new file mode 100644
index 0000000..31f6faf
--- /dev/null
+++ b/po/Makevars
@@ -0,0 +1,79 @@
+# 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_ --keyword=C_:1c,2 --keyword=NC_:1c,2 --keyword=g_dngettext:2,3 --add-comments=Translators:
+
+# 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 = MATE Desktop Environment team
+
+# 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 =
+
+# 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 =
+
+# 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 = yes
+
+# 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 = yes
+$(DOMAIN).pot-update: export GETTEXTDATADIRS = $(top_srcdir)
diff --git a/po/POTFILES.in b/po/POTFILES.in
index a5e7fff..05b3c11 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -5,6 +5,6 @@ libmatekbd/matekbd-keyboard-drawing.c
 libmatekbd/matekbd-keyboard-config.c
 libmatekbd/matekbd-status.c
 libmatekbd/matekbd-util.c
-[type: gettext/gsettings]libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in
-[type: gettext/glade]libmatekbd/show-layout.ui
+libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in
+libmatekbd/show-layout.ui
 test/matekbd-indicator-test.c