GNOME.org
 

[gnome-todo] project: drop intltool

commit e075f180442448574b2e4de614dde4999f4af7f3
Author: Georges Basile Stavracas Neto <georges stavracas gmail com>
Date:   Sat Apr 22 16:24:24 2017 -0300

    project: drop intltool
    
    A semicolon. Just that. A damn semicolon. 6 hours stuck
    in a failed build, just to find that it was a semicolon.

 Makefile.am      |   12 --------
 autogen.sh       |    1 -
 configure.ac     |    7 +++--
 data/Makefile.am |   10 +++----
 po/Makevars      |   78 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 po/POTFILES.in   |   30 ++++++++++----------
 6 files changed, 101 insertions(+), 37 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 2d4066b..5baa27f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -5,24 +5,12 @@ ACLOCAL_AMFLAGS = --install -I m4 ${ACLOCAL_FLAGS}
 SUBDIRS = plugins src data po doc
 DIST_SUBDIRS = $(SUBDIRS)
 
-INTLTOOL_FILES = \
-       intltool-extract.in \
-       intltool-merge.in \
-       intltool-update.in
-
 EXTRA_DIST = \
-       $(INTLTOOL_FILES) \
        README \
        COPYING \
        AUTHORS \
        NEWS
 
-DISTCLEANFILES = \
-       intltool-extract \
-       intltool-merge \
-       intltool-update \
-       po/.intltool-merge-cache
-
 DISTCHECK_CONFIGURE_FLAGS = \
        --enable-appstream-util \
        --disable-gtk-doc \
diff --git a/autogen.sh b/autogen.sh
index 08e886a..b9725ab 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -23,7 +23,6 @@ fi
 
 set -x
 aclocal --install || exit $?
-intltoolize --force --copy --automake || exit $?
 gtkdocize || exit 1
 autoreconf --verbose --force --install -Wno-portability || exit $?
 
diff --git a/configure.ac b/configure.ac
index 22bc04e..dacccee 100644
--- a/configure.ac
+++ b/configure.ac
@@ -19,7 +19,6 @@ AC_CACHE_SAVE
 
 # We require additional macros later on
 AX_REQUIRE_DEFINED([APPSTREAM_XML])
-AX_REQUIRE_DEFINED([IT_PROG_INTLTOOL])
 
 # Add debug symbol
 AX_CHECK_ENABLE_DEBUG([yes], [GNOME_TODO_ENABLE_DEBUG])
@@ -45,8 +44,6 @@ GLIB_GSETTINGS
 dnl ***************************************************************************
 dnl Internationalization
 dnl ***************************************************************************
-IT_PROG_INTLTOOL([0.40.6])
-
 GETTEXT_PACKAGE=AC_PACKAGE_TARNAME
 AC_SUBST(GETTEXT_PACKAGE)
 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [GETTEXT package name])
@@ -54,6 +51,10 @@ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [GETTEXT package name])
 AS_IF([test "x$USE_NLS" != "xno"],
       [AC_DEFINE([ENABLE_NLS], [1], [Native language support is enabled])])
 
+AM_GNU_GETTEXT_VERSION([0.19.8])
+AM_GNU_GETTEXT([external])
+
+
 dnl ================================================================
 dnl GObject introspection support
 dnl ================================================================
diff --git a/data/Makefile.am b/data/Makefile.am
index 4e581c9..bb56685 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -10,18 +10,16 @@ desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
 autostartdir = $(pkgdatadir)
 autostart_DATA = org.gnome.Todo.Autostart.desktop
 
-%.desktop: %.desktop.in Makefile
+%.desktop: %.desktop.in
        $(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
 
-%.ini: %.ini.in
-       LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@
-
-@INTLTOOL_XML_RULE@
-
 appdatadir = $(datadir)/appdata
 appdata_DATA = $(appdata_in_files:.xml.in=.xml)
 appdata_in_files = $(srcdir)/appdata/org.gnome.Todo.appdata.xml.in
 
+%.xml: %.xml.in
+       $(AM_V_GEN) $(MSGFMT) --xml --template $< -d $(top_srcdir)/po -o $@
+
 gsettings_ENUM_NAMESPACE = org.gnome.todo
 gsettings_ENUM_FILES = \
        $(top_srcdir)/src/gtd-enums.h
diff --git a/po/Makevars b/po/Makevars
new file mode 100644
index 0000000..d95666b
--- /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 = 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 6c6f332..7da8b00 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,24 +1,24 @@
 # List of source files containing translatable strings.
 data/appdata/org.gnome.Todo.appdata.xml.in
-[type: gettext/glade]data/gtk/menus.ui
+data/gtk/menus.ui
 data/org.gnome.Todo.desktop.in
 data/org.gnome.todo.gschema.xml
-[type: gettext/glade]data/ui/edit-pane.ui
-[type: gettext/glade]data/ui/empty-list.ui
-[type: gettext/glade]data/ui/initial-setup.ui
-[type: gettext/glade]data/ui/list-selector-panel.ui
-[type: gettext/glade]data/ui/list-view.ui
-[type: gettext/glade]data/ui/new-task-row.ui
-[type: gettext/glade]data/ui/plugin-dialog.ui
-[type: gettext/glade]data/ui/provider-popover.ui
-[type: gettext/glade]data/ui/provider-row.ui
-[type: gettext/glade]data/ui/provider-selector.ui
-[type: gettext/glade]data/ui/task-row.ui
-[type: gettext/glade]data/ui/window.ui
-[type: gettext/glade]plugins/background/ui/preferences.ui
-[type: gettext/glade]plugins/eds/edit-pane.ui
+data/ui/edit-pane.ui
+data/ui/empty-list.ui
+data/ui/initial-setup.ui
+data/ui/list-selector-panel.ui
+data/ui/list-view.ui
+data/ui/new-task-row.ui
+data/ui/plugin-dialog.ui
+data/ui/provider-popover.ui
+data/ui/provider-row.ui
+data/ui/provider-selector.ui
+data/ui/task-row.ui
+data/ui/window.ui
 plugins/background/gtd-plugin-background.c
 plugins/background/org.gnome.todo.background.gschema.xml
+plugins/background/ui/preferences.ui
+plugins/eds/edit-pane.ui
 plugins/eds/gtd-plugin-eds.c
 plugins/eds/gtd-provider-eds.c
 plugins/eds/gtd-provider-local.c
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]