[gnome-tetravex] build: migrate to gettext



commit 08498e35aff980fd1cc43b73e1973461b81069e1
Author: Jeremy Bicha <jbicha ubuntu com>
Date:   Sun Dec 9 09:21:14 2018 -0500

    build: migrate to gettext
    
    Recent gettext version can extract and merge back strings from and to
    various file formats, no need for  intltool anymore.
    
    https://wiki.gnome.org/Initiatives/GnomeGoals/GettextMigration

 autogen.sh                         |  1 -
 configure.ac                       |  3 +-
 data/Makefile.am                   |  6 ++-
 data/gnome-tetravex.appdata.xml.in | 12 +++---
 data/gnome-tetravex.desktop.in     | 11 ++++--
 po/Makevars                        | 78 ++++++++++++++++++++++++++++++++++++++
 po/POTFILES.in                     |  5 +--
 7 files changed, 100 insertions(+), 16 deletions(-)
---
diff --git a/autogen.sh b/autogen.sh
index 941dd06..ace9e51 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -32,7 +32,6 @@ if [ "$#" = 0 -a "x$NOCONFIGURE" = "x" ]; then
 fi
 
 aclocal --install || exit 1
-intltoolize --force --copy --automake || exit 1
 autoreconf --verbose --force --install -Wno-portability || exit 1
 
 cd $olddir
diff --git a/configure.ac b/configure.ac
index d855073..9e60dad 100644
--- a/configure.ac
+++ b/configure.ac
@@ -41,7 +41,8 @@ dnl ###########################################################################
 dnl Internationalization
 dnl ###########################################################################
 
-IT_PROG_INTLTOOL([0.50])
+AM_GNU_GETTEXT_VERSION([0.19.8])
+AM_GNU_GETTEXT([external])
 AC_SUBST(GETTEXT_PACKAGE, gnome-tetravex)
 
 dnl ###########################################################################
diff --git a/data/Makefile.am b/data/Makefile.am
index 39bcb7c..21d2b8c 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -3,12 +3,14 @@ SUBDIRS = icons
 desktop_in_files = gnome-tetravex.desktop.in
 desktopdir = $(datadir)/applications
 desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
-@INTLTOOL_DESKTOP_RULE@
+$(desktop_DATA): $(desktop_in_files) $(wildcard $(top_srcdir)/po/*po)
+       $(AM_V_GEN)$(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
 
 appstream_in_files = gnome-tetravex.appdata.xml.in
 appstream_XML = $(appstream_in_files:.xml.in=.xml)
+$(appstream_XML): $(appstream_in_files) $(wildcard $(top_srcdir)/po/*po)
+       $(AM_V_GEN)$(MSGFMT) --xml --template $< -d $(top_srcdir)/po -o $@
 @APPSTREAM_XML_RULES@
-@INTLTOOL_XML_RULE@
 
 gsettings_SCHEMAS = org.gnome.tetravex.gschema.xml
 @GSETTINGS_RULES@
diff --git a/data/gnome-tetravex.appdata.xml.in b/data/gnome-tetravex.appdata.xml.in
index 02ec38c..960604a 100644
--- a/data/gnome-tetravex.appdata.xml.in
+++ b/data/gnome-tetravex.appdata.xml.in
@@ -4,18 +4,18 @@
   <id>gnome-tetravex.desktop</id>
   <metadata_license>CC0-1.0</metadata_license>
   <project_license>GPL-2.0+ and CC-BY-SA-3.0</project_license>
-  <_name>GNOME Tetravex</_name>
-  <_summary>Reorder tiles to fit a square</_summary>
+  <name>GNOME Tetravex</name>
+  <summary>Reorder tiles to fit a square</summary>
   <description>
-    <_p>
+    <p>
       Each square piece has a number on each side. Position the pieces on the left
       side of the board so that the same numbers are next to each other. If the
       numbers don't match, you can't put the piece there. Move quickly: you're
       being timed!
-    </_p>
-    <_p>
+    </p>
+    <p>
       You can make the game easier or harder by changing the size of the board.
-    </_p>
+    </p>
   </description>
   <screenshots>
     <screenshot type="default" width="748" height="462">
diff --git a/data/gnome-tetravex.desktop.in b/data/gnome-tetravex.desktop.in
index 7d05bbb..5b39b9f 100644
--- a/data/gnome-tetravex.desktop.in
+++ b/data/gnome-tetravex.desktop.in
@@ -1,8 +1,13 @@
 [Desktop Entry]
-_Name=Tetravex
-_Comment=Complete the puzzle by matching numbered tiles
-_Keywords=game;logic;board;
+Name=Tetravex
+Comment=Complete the puzzle by matching numbered tiles
+# TRANSLATORS: Do NOT translate or localize the semicolons!
+#              The list MUST also end with a semicolon!
+#              Search terms to find this application.
+Keywords=game;logic;board;
 Exec=gnome-tetravex
+# TRANSLATORS: Do NOT translate or transliterate this text!
+#              This is an icon file name.
 Icon=gnome-tetravex
 Terminal=false
 Type=Application
diff --git a/po/Makevars b/po/Makevars
new file mode 100644
index 0000000..bfb3105
--- /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 --keyword=Description --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 = The gedit 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 =
+
+# 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/gedit/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 =
+
+# 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 b66d842..93d8478 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,11 +1,10 @@
 # List of source files containing translatable strings.
 # Please keep this file in alphabetical order.
-[encoding: UTF-8]
 data/gnome-tetravex.appdata.xml.in
 data/gnome-tetravex.desktop.in
 data/org.gnome.tetravex.gschema.xml
-[type: gettext/glade]src/app-menu.ui
-[type: gettext/glade]src/gnome-tetravex.ui
+src/app-menu.ui
+src/gnome-tetravex.ui
 src/gnome-tetravex.vala
 src/puzzle.vala
 src/puzzle-view.vala


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