GNOME.org
 

[lightsoff] Migrate from intltool (bgo#786950)

commit f7d3515d943d76965af22db7455a19780a6b3945
Author: Robert Roth <robert roth off gmail com>
Date:   Sun Sep 17 00:53:16 2017 +0300

    Migrate from intltool (bgo#786950)

 autogen.sh                    |    1 -
 configure.ac                  |    3 +-
 data/Makefile.am              |    7 ++--
 data/lightsoff.appdata.xml.in |   14 ++++----
 data/lightsoff.desktop.in     |    8 +++--
 po/Makevars                   |   78 +++++++++++++++++++++++++++++++++++++++++
 po/POTFILES.in                |    5 +--
 7 files changed, 98 insertions(+), 18 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 17fafb7..8dea5e3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -48,7 +48,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, lightsoff)
 
 dnl ###########################################################################
diff --git a/data/Makefile.am b/data/Makefile.am
index 1e2f6ec..56e225b 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -16,12 +16,13 @@ gsettings_SCHEMAS = org.gnome.lightsoff.gschema.xml
 desktop_in_files = lightsoff.desktop.in
 desktopdir = $(datadir)/applications
 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 = lightsoff.appdata.xml.in
 appstream_XML = $(appstream_in_files:.xml.in=.xml)
-@APPSTREAM_XML_RULES@
-@INTLTOOL_XML_RULE@
+$(appstream_XML): $(appstream_in_files)
+       $(AM_V_GEN)$(MSGFMT) --xml --template $< -d $(top_srcdir)/po -o $@
 
 CLEANFILES = \
        $(appstream_XML) \
diff --git a/data/lightsoff.appdata.xml.in b/data/lightsoff.appdata.xml.in
index bc80f88..5e11275 100644
--- a/data/lightsoff.appdata.xml.in
+++ b/data/lightsoff.appdata.xml.in
@@ -4,18 +4,18 @@
   <id>lightsoff.desktop</id>
   <metadata_license>CC0-1.0</metadata_license>
   <project_license>GPL-3.0+</project_license>
-  <_name>Lights Off</_name>
-  <_summary>Turn off all the lights</_summary>
+  <name>Lights Off</name>
+  <summary>Turn off all the lights</summary>
   <description>
-    <_p>
+    <p>
       Lights Off is a collection of light switch puzzles. Clicking on a light
       toggles it either on or off, but also toggles all the surrounding lights,
       too. Your objective is simple: turn off all the lights!
-    </_p>
-    <_p>
+    </p>
+    <p>
      Players who delight in turning off lights will enjoy the huge number of
      levels.
-    </_p>
+    </p>
   </description>
   <screenshots>
     <screenshot height="426" width="379" type="default">
@@ -36,7 +36,7 @@
     <kudo>UserDocs</kudo>
   </kudos>
   <translation type="gettext">lightsoff</translation>
-  <_developer_name>The GNOME Project</_developer_name>
+  <developer_name>The GNOME Project</_developer_name>
   <!-- Generated by  http://apps-xdgapp.rhcloud.com/oars --> 
   <content_rating type="oars-1.0">
     <content_attribute id="violence-cartoon">none</content_attribute>
diff --git a/data/lightsoff.desktop.in b/data/lightsoff.desktop.in
index ad3e05d..7d21096 100644
--- a/data/lightsoff.desktop.in
+++ b/data/lightsoff.desktop.in
@@ -1,7 +1,9 @@
 [Desktop Entry]
-_Name=Lights Off
-_Comment=Turn off all the lights
-_Keywords=game;logic;board;tiles;adjacent;puzzle;
+Name=Lights Off
+Comment=Turn off all the lights
+# Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list 
MUST also end with a semicolon!
+Keywords=game;logic;board;tiles;adjacent;puzzle;
+# Translators: Do NOT translate or transliterate this text (this is an icon file name)!
 Icon=lightsoff
 Exec=lightsoff
 Terminal=false
diff --git a/po/Makevars b/po/Makevars
new file mode 100644
index 0000000..1800d5c
--- /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 = Lightsoff Contributors
+
+# 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 = no
+
+# 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://bugzilla.gnome.org/enter_bug.cgi?product=lightsoff&keywords=I18N+L10N&component=Internationalization 
(i18n)
+
+# 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 0f0137d..5ea9547 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,10 +1,9 @@
 # List of source files containing translatable strings.
 # Please keep this file in alphabetical order.
-[encoding: UTF-8]
 data/lightsoff.appdata.xml.in
 data/lightsoff.desktop.in
-[type: gettext/glade]data/lightsoff-menus.ui
-[type: gettext/glade]data/lightsoff.ui
+data/lightsoff-menus.ui
+data/lightsoff.ui
 data/org.gnome.lightsoff.gschema.xml
 src/board-view.vala
 src/game-view.vala
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]