GNOME.org
 

[gnome-clocks] Drop intltool

commit 83f8f359c6cf9c85177868aa70d3eca73a16fa3f
Author: Paolo Borelli <pborelli gnome org>
Date:   Thu Aug 18 00:05:24 2016 +0200

    Drop intltool
    
    Use new gettext features instead

 Makefile.am                                  |    8 +-
 autogen.sh                                   |    2 +-
 configure.ac                                 |    3 +-
 data/appdata/org.gnome.clocks.appdata.xml.in |   20 +++---
 data/org.gnome.clocks.desktop.in             |   12 ++--
 po/Makevars                                  |   78 ++++++++++++++++++++++++++
 po/POTFILES.in                               |   24 ++++----
 7 files changed, 112 insertions(+), 35 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 1998536..7f7956a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,9 +3,8 @@ ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
 SUBDIRS = help po
 
 # desktop file
-# (we can't use INTLTOOL_DESKTOP_RULE here due to lp#605826)
 %.desktop: %.desktop.in
-       $(MKDIR_P) $(dir $@); LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache 
$(top_srcdir)/po $< $@
+       $(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
 applicationsdir = $(datadir)/applications
 applications_DATA = data/org.gnome.clocks.desktop
 dist_noinst_DATA = data/org.gnome.clocks.desktop.in
@@ -20,9 +19,10 @@ data/org.gnome.clocks.service: data/org.gnome.clocks.service.in Makefile
 
 # appdata file
 appdatadir = $(datadir)/appdata
-appdata_DATA = $(appdata_in_files:.xml.in=.xml)
 appdata_in_files = data/appdata/org.gnome.clocks.appdata.xml.in
-@INTLTOOL_XML_RULE@
+appdata_DATA = $(appdata_in_files:.xml.in=.xml)
+$(appdata_DATA): $(appdata_in_files)
+       $(AM_V_GEN) $(MSGFMT) --xml --template $< -d $(top_srcdir)/po -o $@
 
 # gnome-shell search provider
 searchproviderdir = $(datadir)/gnome-shell/search-providers
diff --git a/autogen.sh b/autogen.sh
index a3f3d60..8daad7e 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -29,7 +29,7 @@ fi
 git submodule update --init --recursive
 
 autopoint --force || exit $?
-AUTOPOINT='intltoolize --automake --copy' autoreconf --force --install --verbose
+autoreconf --force --install --verbose
 
 cd $OLDDIR
 test -n "$NOCONFIGURE" || "$srcdir/configure" "$@"
diff --git a/configure.ac b/configure.ac
index b39d698..04c3cd5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -16,9 +16,8 @@ AC_CONFIG_SRCDIR(src/main.vala)
 AM_INIT_AUTOMAKE([1.11 tar-ustar dist-xz no-dist-gzip foreign])
 m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
 
-IT_PROG_INTLTOOL([0.50.1])
 AM_GNU_GETTEXT([external])
-AM_GNU_GETTEXT_VERSION([0.17])
+AM_GNU_GETTEXT_VERSION([0.19.8])
 GETTEXT_PACKAGE=AC_PACKAGE_NAME
 AC_SUBST([GETTEXT_PACKAGE])
 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE",[The name of the gettext domain])
diff --git a/data/appdata/org.gnome.clocks.appdata.xml.in b/data/appdata/org.gnome.clocks.appdata.xml.in
index 3f0c59f..328529e 100644
--- a/data/appdata/org.gnome.clocks.appdata.xml.in
+++ b/data/appdata/org.gnome.clocks.appdata.xml.in
@@ -3,19 +3,19 @@
   <id>org.gnome.clocks.desktop</id>
   <metadata_license>CC0-1.0</metadata_license>
   <project_license>GPL-2.0</project_license>
-  <_name>GNOME Clocks</_name>
-  <_summary>Clocks for world times, plus alarms, stopwatch and a timer</_summary>
+  <name>GNOME Clocks</name>
+  <summary>Clocks for world times, plus alarms, stopwatch and a timer</summary>
   <description>
-    <_p>
+    <p>
       A simple and elegant clock application.
       It includes world clocks, alarms, a stopwatch and a timer.
-    </_p>
-    <_p>Goals:</_p>
+    </p>
+    <p>Goals:</p>
     <ul>
-      <_li>Show the time in different cities around the world</_li>
-      <_li>Set alarms to wake you up</_li>
-      <_li>Measure elapsed time with an accurate stopwatch</_li>
-      <_li>Set timers to properly cook your food</_li>
+      <li>Show the time in different cities around the world</li>
+      <li>Set alarms to wake you up</li>
+      <li>Measure elapsed time with an accurate stopwatch</li>
+      <li>Set timers to properly cook your food</li>
     </ul>
   </description>
   <kudos>
@@ -30,7 +30,7 @@
   <screenshots>
     <screenshot type="default">
       <image>https://git.gnome.org/browse/gnome-clocks/plain/data/appdata/hi-res-category.png</image>
-      <_caption><!-- Describe this screenshot in less than ~10 words --></_caption>
+      <caption><!-- Describe this screenshot in less than ~10 words --></caption>
     </screenshot>
   </screenshots>
   <url type="homepage">https://wiki.gnome.org/Apps/Clocks</url>
diff --git a/data/org.gnome.clocks.desktop.in b/data/org.gnome.clocks.desktop.in
index 9260c87..3d409d8 100644
--- a/data/org.gnome.clocks.desktop.in
+++ b/data/org.gnome.clocks.desktop.in
@@ -1,9 +1,9 @@
 [Desktop Entry]
-_Name=Clocks
-_GenericName=Clocks
-_X-GNOME-FullName=GNOME Clocks
-_Comment=Clocks for world times, plus alarms, stopwatch and a timer
-_Keywords=time;timer;alarm;world clock;stopwatch;time zone;
+Name=Clocks
+GenericName=Clocks
+X-GNOME-FullName=GNOME Clocks
+Comment=Clocks for world times, plus alarms, stopwatch and a timer
+Keywords=time;timer;alarm;world clock;stopwatch;time zone;
 Exec=gnome-clocks
 Icon=org.gnome.clocks
 Terminal=false
@@ -12,4 +12,4 @@ Categories=GNOME;GTK;Utility;Clock;
 StartupNotify=true
 DBusActivatable=true
 X-GNOME-UsesNotifications=true
-_X-Geoclue-Reason=Allows world clocks to be displayed for your time zone.
+X-Geoclue-Reason=Allows world clocks to be displayed for your time zone.
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 31ea09f..b38bbd8 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,17 +1,17 @@
 data/appdata/org.gnome.clocks.appdata.xml.in
-[type: gettext/glade]data/gtk/help-overlay.ui
-[type: gettext/glade]data/gtk/menus.ui
+data/gtk/help-overlay.ui
+data/gtk/menus.ui
 data/org.gnome.clocks.desktop.in
-[type: gettext/gsettings]data/org.gnome.clocks.gschema.xml.in
-[type: gettext/glade]data/ui/alarmringing.ui
-[type: gettext/glade]data/ui/alarmsetupdialog.ui
-[type: gettext/glade]data/ui/alarm.ui
-[type: gettext/glade]data/ui/stopwatchlapsrow.ui
-[type: gettext/glade]data/ui/stopwatch.ui
-[type: gettext/glade]data/ui/timer.ui
-[type: gettext/glade]data/ui/window.ui
-[type: gettext/glade]data/ui/worldlocationdialog.ui
-[type: gettext/glade]data/ui/world.ui
+data/org.gnome.clocks.gschema.xml.in
+data/ui/alarmringing.ui
+data/ui/alarmsetupdialog.ui
+data/ui/alarm.ui
+data/ui/stopwatchlapsrow.ui
+data/ui/stopwatch.ui
+data/ui/timer.ui
+data/ui/window.ui
+data/ui/worldlocationdialog.ui
+data/ui/world.ui
 src/alarm.vala
 src/application.vala
 src/clock.vala
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]