summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoaquim Rocha <jrocha@endlessm.com>2018-07-24 12:56:29 +0200
committerJoaquim Rocha <jrocha@endlessm.com>2018-07-24 17:14:54 +0200
commitcf40ca59b03010e1be28e2ed24f43c81e9aa2ce4 (patch)
treef609a5e4207c2f324ce91209b83e9e9bf812355a
parent867a4fb47ccdd486db37383fe6774925d1b09d5c (diff)
downloadgnome-initial-setup-cf40ca59b03010e1be28e2ed24f43c81e9aa2ce4.tar.gz
build: Drop intltool use
These changes replace the use of intltool with gettext. Even though we're migrating GNOME Initial Setup to Meson, these changes are needed until the Meson and autotools systems coexist (hopefully not for long).
-rw-r--r--.gitignore1
-rw-r--r--Makefile.am7
-rw-r--r--configure.ac6
-rw-r--r--data/Makefile.am3
-rw-r--r--po/Makevars78
5 files changed, 89 insertions, 6 deletions
diff --git a/.gitignore b/.gitignore
index 3844b01..93ecbbc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -31,7 +31,6 @@ po/*.gmo
po/*.header
po/*.sed
po/*.sin
-po/.intltool-merge-cache
po/Makefile.in.in
po/Makevars.template
po/POTFILES
diff --git a/Makefile.am b/Makefile.am
index d75bd5d..4d6e4e1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -10,3 +10,10 @@ EXTRA_DIST = \
AUTHORS \
NEWS \
gnome-initial-setup.doap
+
+MAINTAINERCLEANFILES = \
+ po/*.header \
+ po/Makevars.template \
+ po/Rules-quot \
+ po/*.sed \
+ po/*.sin
diff --git a/configure.ac b/configure.ac
index ade8008..c404e46 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10,14 +10,12 @@ AC_PROG_CC
LT_INIT
-IT_PROG_INTLTOOL([0.40])
-
+AM_GNU_GETTEXT([external])
+AM_GNU_GETTEXT_VERSION([0.19.8])
GETTEXT_PACKAGE=gnome-initial-setup
AC_SUBST(GETTEXT_PACKAGE)
AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [gettext package])
-AM_GLIB_GNU_GETTEXT
-
AC_ARG_WITH(vendor-conf-file,
AS_HELP_STRING([--with-vendor-conf-file=<file>],
[vendor conf file]))
diff --git a/data/Makefile.am b/data/Makefile.am
index f9a9e12..3dcc686 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -10,7 +10,8 @@ edit = $(AM_V_GEN) sed \
%.desktop.in: %.desktop.in.in Makefile
$(edit) $< >$@
-@INTLTOOL_DESKTOP_RULE@
+%.desktop: %.desktop.in
+ $(AM_V_GEN) msgfmt --desktop -d $(top_srcdir)/po --template $< -o $@
rulesdir = $(datadir)/polkit-1/rules.d
rules_DATA = 20-gnome-initial-setup.rules
diff --git a/po/Makevars b/po/Makevars
new file mode 100644
index 0000000..76426e3
--- /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_ --keyword=C_:1c,2 --keyword=NC_:1c,2 --keyword=g_dngettext:2,3
+
+# 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 =
+
+# 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://gitlab.gnome.org/GNOME/gnome-initial-setup/issues
+
+# 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 = yes
+
+# 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 = --no-location --no-wrap
+
+# 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 = --no-wrap
+
+# 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