GNOME.org
 

[gnome-logs] Migrate from intltool to gettext.

commit ab2108662183805273e014b1ecf705be745f8d85
Author: Niels De Graef <nielsdegraef gmail com>
Date:   Sat Sep 2 02:05:51 2017 +0200

    Migrate from intltool to gettext.
    
    For more info, see [1].
    
    [1] https://wiki.gnome.org/MigratingFromIntltoolToGettext
    
    Signed-off-by: Niels De Graef <nielsdegraef gmail com>

 Makefile.am                        |    6 ++-
 configure.ac                       |    3 +-
 data/org.gnome.Logs.appdata.xml.in |   12 +++---
 data/org.gnome.Logs.desktop.in     |    8 ++--
 po/Makevars                        |   78 ++++++++++++++++++++++++++++++++++++
 po/POTFILES.in                     |   18 ++++----
 6 files changed, 103 insertions(+), 22 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 8ad7465..a5b7b4b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -75,16 +75,18 @@ nodist_gnome_logs_headers = \
        $(AM_V_at)touch $@
 
 @APPSTREAM_XML_RULES@
-@INTLTOOL_XML_RULE@
 appstream_in_files = data/org.gnome.Logs.appdata.xml.in
 $(appstream_in_files:.appdata.xml.in=.appdata.xml): data/.dstamp
 appstream_XML = $(appstream_in_files:.appdata.xml.in=.appdata.xml)
+$(appstream_XML): $(appstream_in_files)
+       $(AM_V_GEN) $(MSGFMT) --xml --template $< -d $(top_srcdir)/po -o $@
 
-@INTLTOOL_DESKTOP_RULE@
 desktopdir = $(datadir)/applications
 desktop_in_files = data/org.gnome.Logs.desktop.in
 $(desktop_in_files:.desktop.in=.desktop): data/.dstamp
 desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
+$(desktop_DATA): $(desktop_in_files)
+       $(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
 
 data/org.gnome.Logs.service: data/org.gnome.Logs.service.in
        $(AM_V_GEN)$(SED) -e "s|[@]bindir[@]|$(bindir)|" $< > $@
diff --git a/configure.ac b/configure.ac
index 102b4d7..4d327c1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -31,7 +31,8 @@ AS_IF([test "x$GLIB_MKENUMS" = "x"],
 AC_SUBST([GLIB_COMPILE_RESOURCES], [`$PKG_CONFIG --variable glib_compile_resources gio-2.0`])
 
 dnl Internationalization
-IT_PROG_INTLTOOL([0.50.0])
+AM_GNU_GETTEXT([external])
+AM_GNU_GETTEXT_VERSION([0.19.8])
 AC_SUBST([GETTEXT_PACKAGE], [AC_PACKAGE_TARNAME])
 AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE], ["$GETTEXT_PACKAGE"], [gettext package name])
 
diff --git a/data/org.gnome.Logs.appdata.xml.in b/data/org.gnome.Logs.appdata.xml.in
index f0522f3..116bc09 100644
--- a/data/org.gnome.Logs.appdata.xml.in
+++ b/data/org.gnome.Logs.appdata.xml.in
@@ -4,13 +4,13 @@
   <id>org.gnome.Logs.desktop</id>
   <metadata_license>CC0-1.0</metadata_license>
   <project_license>GPL-3.0+</project_license>
-  <_name>GNOME Logs</_name>
-  <_summary>View detailed event logs for the system</_summary>
+  <name>GNOME Logs</name>
+  <summary>View detailed event logs for the system</summary>
   <description>
-    <_p>Logs shows events from the systemd journal, and sorts them into
-        categories, such as hardware and applications.</_p>
-    <_p>Using Logs you can search your logs by typing a search term, and
-        view detailed information about each event by clicking on it.</_p>
+    <p>Logs shows events from the systemd journal, and sorts them into
+       categories, such as hardware and applications.</p>
+    <p>Using Logs you can search your logs by typing a search term, and
+       view detailed information about each event by clicking on it.</p>
   </description>
   <screenshots>
     <screenshot height="575" width="1000" type="default">
diff --git a/data/org.gnome.Logs.desktop.in b/data/org.gnome.Logs.desktop.in
index 4d46915..f64ae71 100644
--- a/data/org.gnome.Logs.desktop.in
+++ b/data/org.gnome.Logs.desktop.in
@@ -1,9 +1,9 @@
 [Desktop Entry]
-_Name=Logs
-_GenericName=Log Viewer
-_Comment=View detailed event logs for the system
+Name=Logs
+GenericName=Log Viewer
+Comment=View detailed event logs for the system
 # Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list 
MUST also end with a semicolon!
-_Keywords=log;journal;debug;error;
+Keywords=log;journal;debug;error;
 Type=Application
 Categories=GTK;GNOME;System;Monitor;Utility;X-GNOME-Utilities;
 Exec=gnome-logs
diff --git a/po/Makevars b/po/Makevars
new file mode 100644
index 0000000..6e746be
--- /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 = 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 4b16930..1208ce6 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,16 +1,16 @@
 # List of source files containing translatable strings.
 # Please keep this file sorted alphabetically.
-[type: gettext/glade]data/gl-categorylist.ui
-[type: gettext/glade]data/gl-eventtoolbar.ui
-[type: gettext/glade]data/gl-eventviewdetail.ui
-[type: gettext/glade]data/gl-eventviewlist.ui
-[type: gettext/glade]data/gl-searchpopover.ui
-[type: gettext/glade]data/gl-window.ui
-[type: gettext/glade]data/help-overlay.ui
-[type: gettext/glade]data/menus.ui
+data/gl-categorylist.ui
+data/gl-eventtoolbar.ui
+data/gl-eventviewdetail.ui
+data/gl-eventviewlist.ui
+data/gl-searchpopover.ui
+data/gl-window.ui
+data/help-overlay.ui
+data/menus.ui
 data/org.gnome.Logs.appdata.xml.in
 data/org.gnome.Logs.desktop.in
-[type: gettext/gsettings]data/org.gnome.Logs.gschema.xml
+data/org.gnome.Logs.gschema.xml
 src/gl-application.c
 src/gl-eventtoolbar.c
 src/gl-eventviewdetail.c
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]