GNOME.org
 

[gnome-robots: 1/2] Stop using intltool

commit 57d39eb21332ad6cae6e8a829d63f284d9f4a469
Author: Jeremy Bicha <jbicha ubuntu com>
Date:   Fri Jan 11 11:55:21 2019 -0500

    Stop using intltool
    
    modern gettext is sufficient
    
    https://wiki.gnome.org/Initiatives/GnomeGoals/GettextMigration

 autogen.sh                       |  1 -
 configure.ac                     |  3 +-
 data/Makefile.am                 |  6 ++--
 data/gnome-robots.appdata.xml.in | 18 +++++-----
 data/gnome-robots.desktop.in     |  8 +++--
 po/Makevars                      | 78 ++++++++++++++++++++++++++++++++++++++++
 po/POTFILES.in                   |  3 +-
 7 files changed, 99 insertions(+), 18 deletions(-)
---
diff --git a/autogen.sh b/autogen.sh
index 0c05d44..d1deec7 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 2980f82..1668a50 100644
--- a/configure.ac
+++ b/configure.ac
@@ -45,7 +45,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-robots)
 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [The gettext package name])
 
diff --git a/data/Makefile.am b/data/Makefile.am
index 33f3502..8de46a6 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -55,12 +55,14 @@ config_DATA = robots2.cfg \
 desktopdir = $(datadir)/applications
 desktop_in_files = gnome-robots.desktop.in
 desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
-@INTLTOOL_DESKTOP_RULE@
+$(desktop_DATA): $(desktop_in_files)
+       $(AM_V_GEN)$(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
 
 appstream_in_files = gnome-robots.appdata.xml.in
 appstream_XML = $(appstream_in_files:.xml.in=.xml)
+$(appstream_XML): $(appstream_in_files)
+       $(AM_V_GEN)$(MSGFMT) --xml --template $< -d $(top_srcdir)/po -o $@
 @APPSTREAM_XML_RULES@
-@INTLTOOL_XML_RULE@
 
 EXTRA_DIST = $(cursor_files) \
              $(appstream_in_files) \
diff --git a/data/gnome-robots.appdata.xml.in b/data/gnome-robots.appdata.xml.in
index a55f394..19e4c29 100644
--- a/data/gnome-robots.appdata.xml.in
+++ b/data/gnome-robots.appdata.xml.in
@@ -4,25 +4,25 @@
   <id>gnome-robots.desktop</id>
   <metadata_license>CC0-1.0</metadata_license>
   <project_license>GPL-3.0+</project_license>
-  <_name>GNOME Robots</_name>
-  <_summary>Avoid the robots and make them crash into each other</_summary>
+  <name>GNOME Robots</name>
+  <summary>Avoid the robots and make them crash into each other</summary>
   <description>
-    <_p>
+    <p>
       It is the distant future – the year 2000. Evil robots are trying to kill you.
       Avoid the robots or face certain death.
-    </_p>
-    <_p>
+    </p>
+    <p>
       Fortunately, the robots are extremely stupid and will always move directly
       towards you. Trick them into colliding into each other, resulting in their
       destruction, or into the junk piles that result. You can defend yourself by
       moving the junk piles, or escape to safety with your handy teleportation
       device.
-    </_p>
-    <_p>
+    </p>
+    <p>
       Your supply of safe teleports is limited, and once you run out, teleportation
       could land you right next to a robot, who will kill you. Survive for as long
       as possible!
-    </_p>
+    </p>
   </description>
   <screenshots>
     <screenshot type="default" width="1148" height="623">
@@ -43,7 +43,7 @@
     <kudo>UserDocs</kudo>
   </kudos>
   <translation type="gettext">gnome-robots</translation>
-  <_developer_name>The GNOME Project</_developer_name>
+  <developer_name>The GNOME Project</developer_name>
   <content_rating type="oars-1.0">
     <content_attribute id="violence-cartoon">mild</content_attribute>
     <content_attribute id="violence-fantasy">none</content_attribute>
diff --git a/data/gnome-robots.desktop.in b/data/gnome-robots.desktop.in
index 4890b12..7692ae9 100644
--- a/data/gnome-robots.desktop.in
+++ b/data/gnome-robots.desktop.in
@@ -1,8 +1,10 @@
 [Desktop Entry]
-_Name=Robots
-_Comment=Avoid the robots and make them crash into each other
-_Keywords=game;arcade;teleport;
+Name=Robots
+Comment=Avoid the robots and make them crash into each other
+# Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list 
MUST also end with a semicolon!
+Keywords=game;arcade;teleport;
 Exec=gnome-robots
+# Translators: Do NOT translate or transliterate this text (this is an icon file name)!
 Icon=gnome-robots
 Terminal=false
 Type=Application
diff --git a/po/Makevars b/po/Makevars
new file mode 100644
index 0000000..fe1a046
--- /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 = The GNOME Robots Developers
+
+# 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/gnome-klotski/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 daf2c42..3d7a8f7 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,7 +1,6 @@
 # List of source files containing translatable strings.
 # Please keep this file in alphabetical order.
-[encoding: UTF-8]
-[type: gettext/glade]data/app-menu.ui
+data/app-menu.ui
 data/gnome-robots.appdata.xml.in
 data/gnome-robots.desktop.in
 data/org.gnome.robots.gschema.xml
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]