GNOME.org
 

[office-runner] build: Migrate to external gettext

commit e04f7fff6680d43e99b5d13788ce8ce522e87d4b
Author: Luis Menina <liberforce freeside fr>
Date:   Thu Apr 27 09:51:53 2017 +0200

    build: Migrate to external gettext
    
    As per GNOME Goal at:
    https://wiki.gnome.org/Initiatives/GnomeGoals/GettextMigration

 Makefile.am                      |    9 ++--
 configure.ac                     |    3 +-
 po/Makevars                      |   78 ++++++++++++++++++++++++++++++++++++++
 po/POTFILES.in                   |    4 +-
 src/Makefile.am                  |    6 ++-
 src/office-runner.appdata.xml.in |   10 ++--
 6 files changed, 95 insertions(+), 15 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index a97c544..42ff258 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,10 +1,9 @@
 SUBDIRS = po icons src
 
-EXTRA_DIST =                   \
-       intltool-extract.in     \
-       intltool-merge.in       \
-       intltool-update.in
+EXTRA_DIST = config.rpath
 
-DISTCLEANFILES = intltool-extract intltool-merge intltool-update
+DISTCLEANFILES =
 
 -include $(top_srcdir)/git.mk
+
+ACLOCAL_AMFLAGS = -I m4
diff --git a/configure.ac b/configure.ac
index d2990cb..6d21533 100644
--- a/configure.ac
+++ b/configure.ac
@@ -18,7 +18,8 @@ dnl Add the languages which your application supports to po/LINGUAS
 GETTEXT_PACKAGE=office-runner
 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, ["$GETTEXT_PACKAGE"], [Define to the Gettext package name])
 AC_SUBST(GETTEXT_PACKAGE)
-IT_PROG_INTLTOOL([0.40.0])
+AM_GNU_GETTEXT_VERSION([0.19.8])
+AM_GNU_GETTEXT([external])
 
 PKG_CHECK_MODULES(OFFICE_RUNNER, gtk+-3.0 >= 3.8 upower-glib >= 0.99.0)
 
diff --git a/po/Makevars b/po/Makevars
new file mode 100644
index 0000000..579ebd1
--- /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 = --keyword=_ --keyword=N_
+
+# 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
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 6822ca6..d916e75 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,4 +1,4 @@
 src/office-runner.c
-[type: gettext/glade] src/office-runner.ui
-[type: gettext/ini] src/office-runner.desktop.in
+src/office-runner.ui
+src/office-runner.desktop.in
 src/office-runner.appdata.xml.in
diff --git a/src/Makefile.am b/src/Makefile.am
index fa2a35c..a95850f 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -17,12 +17,14 @@ stuffdir = $(pkgdatadir)
 desktop_in_files = office-runner.desktop.in
 desktopdir = $(datadir)/applications
 desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
-@INTLTOOL_DESKTOP_RULE@
+office-runner.desktop: office-runner.desktop.in
+       $(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
 
 appdata_in_files = office-runner.appdata.xml.in
 appdatadir = $(datarootdir)/appdata
 appdata_DATA = $(appdata_in_files:.xml.in=.xml)
-@INTLTOOL_XML_RULE@
+$(appdata_DATA): $(appdata_in_files)
+       $(AM_V_GEN) $(MSGFMT) --xml --template $< -d $(top_srcdir)/po -o $@
 
 EXTRA_DIST = $(stuff_DATA) $(desktop_in_files) $(appdata_in_files)
 
diff --git a/src/office-runner.appdata.xml.in b/src/office-runner.appdata.xml.in
index c09e750..37cee01 100644
--- a/src/office-runner.appdata.xml.in
+++ b/src/office-runner.appdata.xml.in
@@ -6,17 +6,17 @@
   <id type="desktop">office-runner.desktop</id>
   <name>Office Runner</name>
   <metadata_license>CC0-1.0</metadata_license>
-  <_summary>Close your laptop lid and start running</_summary>
+  <summary>Close your laptop lid and start running</summary>
   <description>
-    <_p>
+    <p>
       Office Runner is a game where tallying up the time taken to go from one place in
       your office to the other.
-    </_p>
-    <_p>
+    </p>
+    <p>
       Incidentally, it will also let you close your laptop lid without the computer going
       to sleep, which is useful to avoid having to reconnect to the network after your
       short trip.
-    </_p>
+    </p>
   </description>
   <url type="homepage">http://www.hadess.net/2011/09/omg-i-haz-designed-bug-fix.html</url>
   <screenshots>
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]