GNOME.org
 

[mousetweaks] Stop using intltool

commit 07f21211881dcf660afcc9e67fcd2bee69a85cee
Author: Jeremy Bicha <jbicha debian org>
Date:   Sat Jan 12 22:24:01 2019 -0500

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

 Makefile.am                                        |  6 +-
 configure.ac                                       |  8 +--
 data/Makefile.am                                   |  4 +-
 ...ma.xml.in => org.gnome.mousetweaks.gschema.xml} | 12 ++--
 po/Makevars                                        | 78 ++++++++++++++++++++++
 po/POTFILES.in                                     |  4 +-
 6 files changed, 92 insertions(+), 20 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index ebbce83..69daff8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -19,11 +19,7 @@ MAINTAINERCLEANFILES =              \
     $(srcdir)/install-sh            \
     $(srcdir)/missing               \
     $(srcdir)/mkinstalldirs         \
-    $(srcdir)/omf.make              \
-    $(srcdir)/xmldocs.make          \
-    $(srcdir)/intltool-extract.in   \
-    $(srcdir)/intltool-merge.in     \
-    $(srcdir)/intltool-update.in
+    $(srcdir)/xmldocs.make
 
 # Generate ChangeLog
 dist-hook:
diff --git a/configure.ac b/configure.ac
index 20b5232..27f0273 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,9 +1,9 @@
 AC_PREREQ([2.64])
 AC_INIT([mousetweaks],
         [3.12.0],
-        [https://bugzilla.gnome.org/enter_bug.cgi?product=mousetweaks],
+        [https://gitlab.gnome.org/GNOME/mousetweaks/issues],
         [mousetweaks],
-        [https://live.gnome.org/Mousetweaks/Home])
+        [https://wiki.gnome.org/Projects/Mousetweaks])
 
 AC_CONFIG_SRCDIR([src])
 AC_CONFIG_HEADER([config.h])
@@ -27,12 +27,12 @@ GNOME_MAINTAINER_MODE_DEFINES
 
 dnl *** i18n ***
 
-IT_PROG_INTLTOOL([0.40.0])
+AM_GNU_GETTEXT_VERSION([0.19.8])
+AM_GNU_GETTEXT([external])
 
 GETTEXT_PACKAGE=mousetweaks
 AC_SUBST(GETTEXT_PACKAGE)
 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Gettext Package])
-AM_GLIB_GNU_GETTEXT
 
 dnl *** gsettings ***
 
diff --git a/data/Makefile.am b/data/Makefile.am
index ab5fd14..cedccaf 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -7,9 +7,7 @@ convert_DATA = mousetweaks.convert
 gsettings_ENUM_NAMESPACE = org.gnome.mousetweaks
 gsettings_ENUM_FILES = $(top_srcdir)/src/mt-common.h
 
-gsettings_in_files = org.gnome.mousetweaks.gschema.xml.in
-gsettings_SCHEMAS = $(gsettings_in_files:.xml.in=.xml)
-@INTLTOOL_XML_NOMERGE_RULE@
+gsettings_SCHEMAS = org.gnome.mousetweaks.gschema.xml
 @GSETTINGS_RULES@
 
 EXTRA_DIST =                \
diff --git a/data/org.gnome.mousetweaks.gschema.xml.in b/data/org.gnome.mousetweaks.gschema.xml
similarity index 54%
rename from data/org.gnome.mousetweaks.gschema.xml.in
rename to data/org.gnome.mousetweaks.gschema.xml
index 50edbaf..e932f94 100644
--- a/data/org.gnome.mousetweaks.gschema.xml.in
+++ b/data/org.gnome.mousetweaks.gschema.xml
@@ -2,18 +2,18 @@
   <schema id="org.gnome.mousetweaks" path="/org/gnome/desktop/a11y/mouse/" gettext-domain="mousetweaks">
     <key name="click-type-window-style" enum="org.gnome.mousetweaks.MtClickTypeWindowStyle">
       <default>'both'</default>
-      <_summary>Click-type window style</_summary>
-      <_description>Button style of the click-type window.</_description>
+      <summary>Click-type window style</summary>
+      <description>Button style of the click-type window.</description>
     </key>
     <key name="click-type-window-orientation" enum="org.gnome.mousetweaks.MtClickTypeWindowOrientation">
       <default>'vertical'</default>
-      <_summary>Click-type window orientation</_summary>
-      <_description>Orientation of the click-type window.</_description>
+      <summary>Click-type window orientation</summary>
+      <description>Orientation of the click-type window.</description>
     </key>
     <key name="click-type-window-geometry" type="s">
       <default>''</default>
-      <_summary>Click-type window geometry</_summary>
-      <_description>Size and position of the click-type window. The format is a standard X Window System 
geometry string.</_description>
+      <summary>Click-type window geometry</summary>
+      <description>Size and position of the click-type window. The format is a standard X Window System 
geometry string.</description>
     </key>
   </schema>
 </schemalist>
diff --git a/po/Makevars b/po/Makevars
new file mode 100644
index 0000000..4716c05
--- /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 = Gerd Kohlberger
+
+# 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/mousetweaks/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 9cffe02..4e25a7e 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,5 +1,5 @@
-[type: gettext/glade]data/mousetweaks.ui
-data/org.gnome.mousetweaks.gschema.xml.in
+data/mousetweaks.ui
+data/org.gnome.mousetweaks.gschema.xml
 src/mt-main.c
 src/mt-ctw.c
 src/mt-common.c
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]