GNOME.org
 

[gnome-desktop] Migrate from intltool to gettext

commit c7a1cf3c4ccd1a0155b00deb4153459394b8e20d
Author: Matthias Clasen <mclasen redhat com>
Date:   Wed Aug 1 13:02:15 2018 +0000

    Migrate from intltool to gettext
    
    Intltool is deprecated and should no longer be used.
    
    Patch by Niels De Graef,
    
    https://bugzilla.gnome.org/show_bug.cgi?id=787386

 Makefile.am  |  7 ++----
 configure.ac |  8 +++----
 git.mk       |  2 ++
 po/Makevars  | 78 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 85 insertions(+), 10 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index a62fdc78..5240446b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -11,15 +11,13 @@ AM_DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc
 versiondir = $(datadir)/gnome
 version_DATA = gnome-version.xml
 
-@INTLTOOL_XML_RULE@
-
 EXTRA_DIST =                   \
        COPYING-DOCS            \
        HACKING                 \
        MAINTAINERS             \
        ChangeLog.pre-git       \
        glib-tap.mk             \
-       gnome-version.xml.in.in \
+       gnome-version.xml.in    \
        tap-driver.sh           \
        tap-test
 
@@ -43,8 +41,7 @@ MAINTAINERCLEANFILES = \
        $(srcdir)/configure \
        $(srcdir)/gtk-doc.make \
        $(srcdir)/m4/gnome-doc-utils.m4 \
-       $(srcdir)/m4/gtk-doc.m4 \
-       $(srcdir)/m4/intltool.m4
+       $(srcdir)/m4/gtk-doc.m4
 
 CHANGELOG_GIT_RANGE = GNOME_DESKTOP_2_26_1..
 dist-hook:
diff --git a/configure.ac b/configure.ac
index 26f04912..38e06cca 100644
--- a/configure.ac
+++ b/configure.ac
@@ -35,8 +35,6 @@ AC_SUBST(LT_VERSION)
 LT_PREREQ([2.2.6])
 LT_INIT([dlopen win32-dll disable-static])
 
-IT_PROG_INTLTOOL([0.40.6])
-
 AC_PROG_CC
 PKG_PROG_PKG_CONFIG
 
@@ -210,14 +208,14 @@ dnl Documentation support
 YELP_HELP_INIT
 
 dnl Language Support
+AM_GNU_GETTEXT([external])
+AM_GNU_GETTEXT_VERSION([0.19.8])
 
 GETTEXT_PACKAGE=gnome-desktop-3.0
 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE",
                   [The gettext translation domain])
 AC_SUBST(GETTEXT_PACKAGE)
 
-AM_GLIB_GNU_GETTEXT
-
 GOBJECT_INTROSPECTION_CHECK([0.9.7])
 
 # check for gtk-doc
@@ -231,7 +229,7 @@ libgnome-desktop/gnome-desktop-3.0-uninstalled.pc
 docs/Makefile
 docs/reference/Makefile
 docs/reference/gnome-desktop3/Makefile
-gnome-version.xml.in
+gnome-version.xml
 po/Makefile.in
 desktop-docs/Makefile
 desktop-docs/fdl/Makefile
diff --git a/git.mk b/git.mk
index ff5c0c3d..3543d1f3 100644
--- a/git.mk
+++ b/git.mk
@@ -125,6 +125,7 @@ $(srcdir)/.gitignore: Makefile.am $(top_srcdir)/git.mk
                fi; \
                if test -f $(srcdir)/po/Makefile.in.in; then \
                        for x in \
+                               ABOUT-NLS \
                                po/Makefile.in.in \
                                po/Makefile.in \
                                po/Makefile \
@@ -144,6 +145,7 @@ $(srcdir)/.gitignore: Makefile.am $(top_srcdir)/git.mk
                                autom4te.cache \
                                configure \
                                config.h \
+                               config.rpath \
                                stamp-h1 \
                                libtool \
                                config.lt \
diff --git a/po/Makevars b/po/Makevars
new file mode 100644
index 00000000..6e746be9
--- /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 = Free Software Foundation, Inc.
+
+# 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 = 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
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]