[alacarte/wip/muktupavels/gettext] use upstream gettext

From: Alberts Muktupāvels <muktupavels src gnome org>
To: commits-list gnome org
Cc:
Subject: [alacarte/wip/muktupavels/gettext] use upstream gettext
Date: Mon, 21 Mar 2022 11:42:12 +0000 (UTC)

commit d64d0a56820b162828c57728a19c69c3164e372a
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date:   Mon Mar 21 13:40:21 2022 +0200

    use upstream gettext

 Makefile.am                 | 13 +++++++-
 configure.ac                |  9 +++---
 data/Makefile.am            |  4 ++-
 data/alacarte.desktop.in.in |  4 +--
 po/Makevars                 | 78 +++++++++++++++++++++++++++++++++++++++++++++
 po/POTFILES.in              |  7 ++--
 6 files changed, 103 insertions(+), 12 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 09fc52f..a094252 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -31,11 +31,22 @@ MAINTAINERCLEANFILES = \
        $(GITIGNORE_MAINTAINERCLEANFILES_MAKEFILE_IN) \
        $(GITIGNORE_MAINTAINERCLEANFILES_M4_LIBTOOL) \
        $(GITIGNORE_MAINTAINERCLEANFILES_M4_GETTEXT) \
+       `find "$(srcdir)/m4" -type f -name "*.m4" -print` \
        $(srcdir)/ABOUT-NLS \
        $(srcdir)/INSTALL \
        $(srcdir)/config.h.in~ \
        $(srcdir)/configure \
-       $(srcdir)/po/.intltool-merge-cache.lock \
+       $(srcdir)/po/Makefile.in.in \
+       $(srcdir)/po/Makevars.template \
+       $(srcdir)/po/Rules-quot \
+       $(srcdir)/po/boldquot.sed \
+       $(srcdir)/po/en@boldquot.header \
+       $(srcdir)/po/en@quot.header \
+       $(srcdir)/po/alacarte.pot \
+       $(srcdir)/po/insert-header.sin \
+       $(srcdir)/po/quot.sed \
+       $(srcdir)/po/remove-potcdate.sin \
+       $(srcdir)/po/stamp-po \
        $(srcdir)/py-compile \
        $(NULL)
 
diff --git a/configure.ac b/configure.ac
index 1225822..df4c8f0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11,12 +11,13 @@ AM_MAINTAINER_MODE
 dnl put the ACLOCAL flags in the makefile
 ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS"
 
+AM_GNU_GETTEXT([external])
+AM_GNU_GETTEXT_VERSION([0.19.8])
+AM_GNU_GETTEXT_REQUIRE_VERSION([0.19.8])
 
 GETTEXT_PACKAGE=alacarte
-AC_SUBST(GETTEXT_PACKAGE)
-AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Gettext package])
-AM_GLIB_GNU_GETTEXT
-IT_PROG_INTLTOOL([0.40.0])
+AC_SUBST([GETTEXT_PACKAGE])
+AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE], ["$GETTEXT_PACKAGE"], [Gettext package])
 
 AM_PATH_PYTHON(3.3)
 
diff --git a/data/Makefile.am b/data/Makefile.am
index 85c2b28..977c395 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,6 +1,8 @@
 SUBDIRS = icons
 
-@INTLTOOL_DESKTOP_RULE@
+%.desktop: %.desktop.in
+       $(AM_V_GEN) $(MSGFMT) --desktop --template $< -o $@-t \
+               -d $(top_srcdir)/po && mv $@-t $@
 
 desktopdir = $(datadir)/applications
 desktop_in_files = alacarte.desktop.in
diff --git a/data/alacarte.desktop.in.in b/data/alacarte.desktop.in.in
index 93f0476..b2dcb5e 100644
--- a/data/alacarte.desktop.in.in
+++ b/data/alacarte.desktop.in.in
@@ -1,6 +1,6 @@
 [Desktop Entry]
-_Name=Main Menu
-_Comment=Add or remove applications from the main menu
+Name=Main Menu
+Comment=Add or remove applications from the main menu
 Exec=alacarte
 Terminal=false
 Type=Application
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 6a3e835..3683dc9 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,8 +1,7 @@
-[encoding: UTF-8]
 Alacarte/MainWindow.py
 Alacarte/MenuEditor.py
 Alacarte/ItemEditor.py
 data/alacarte.desktop.in.in
-[type: gettext/glade]data/alacarte.ui
-[type: gettext/glade]data/launcher-editor.ui
-[type: gettext/glade]data/directory-editor.ui
+data/alacarte.ui
+data/launcher-editor.ui
+data/directory-editor.ui
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]