[folks] Migrate from intltool to gettext.



commit b86afaae2f30144753dfa9835f9bd241a37b8245
Author: Niels De Graef <nielsdegraef gmail com>
Date:   Wed Sep 27 12:33:44 2017 +0200

    Migrate from intltool to gettext.
    
    See also https://wiki.gnome.org/Initiatives/GnomeGoals/GettextMigration

 autogen.sh     |    1 -
 configure.ac   |    3 +-
 po/Makevars    |   78 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 po/POTFILES.in |    3 +-
 4 files changed, 81 insertions(+), 4 deletions(-)
---
diff --git a/autogen.sh b/autogen.sh
index a38c8cb..abfae37 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -2,7 +2,6 @@
 set -e
 
 autoreconf -i -f
-intltoolize --force --copy --automake
 
 if test -z "$NOCONFIGURE"; then
     run_configure=true
diff --git a/configure.ac b/configure.ac
index 2f220da..0debf38 100644
--- a/configure.ac
+++ b/configure.ac
@@ -603,7 +603,8 @@ AS_IF([test "x$enable_docs" = "xyes" -a "x$have_valadoc" != "xyes"], [
 GETTEXT_PACKAGE=AC_PACKAGE_NAME
 AC_SUBST(GETTEXT_PACKAGE)
 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, ["$GETTEXT_PACKAGE"], [Define the gettext package to be used])
-IT_PROG_INTLTOOL([0.50.0])
+AM_GNU_GETTEXT([external])
+AM_GNU_GETTEXT_VERSION([0.19.8])
 
 # -----------------------------------------------------------
 # Error flags
diff --git a/po/Makevars b/po/Makevars
new file mode 100644
index 0000000..cba2b92
--- /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 --add-comments
+
+# 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 = $(PACKAGE_STRING) authors
+
+# 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 = $(PACKAGE_BUGREPORT)
+
+# 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 =
+
+# 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 17ab450..7cac02c 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,4 +1,3 @@
-[encoding: UTF-8]
 backends/bluez/bluez-backend.vala
 backends/bluez/bluez-persona-store.vala
 backends/eds/lib/edsf-persona-store.vala
@@ -28,7 +27,7 @@ folks/local-id-details.vala
 folks/location-details.vala
 folks/name-details.vala
 folks/note-details.vala
-[type: gettext/gsettings]folks/org.freedesktop.folks.gschema.xml.in
+folks/org.freedesktop.folks.gschema.xml.in
 folks/phone-details.vala
 folks/postal-address-details.vala
 folks/presence-details.vala


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]