diff options
author | Bastien Nocera <hadess@hadess.net> | 2019-09-10 12:55:55 +0200 |
---|---|---|
committer | Bastien Nocera <hadess@hadess.net> | 2019-09-10 13:18:09 +0200 |
commit | 7202880675f61e06bbb94d7b7974438a2a909ed0 (patch) | |
tree | 08c943d709b352ae1f198e1d65c9d9cf84ad5844 | |
parent | a4aaf5780ca0aea7dc58cb8753b2f65a4992348d (diff) | |
download | shared-mime-info-wip/hadess/really-gettext.tar.gz |
build: Don't use an intermediate .pot file to do translationswip/hadess/really-gettext
Declare freedesktop.org.xml.in to be translatable directly, without
extracting translatable strings from a .pot which we then translate,
which we then need to merge into translations.
Files in its/ from Robert Ancell <robert.ancell@canonical.com>
https://gitlab.freedesktop.org/xdg/shared-mime-info/merge_requests/4
-rw-r--r-- | Makefile.am | 22 | ||||
-rw-r--r-- | its/shared-mime-info.its | 9 | ||||
-rw-r--r-- | its/shared-mime-info.loc | 6 | ||||
-rw-r--r-- | mime-info.its | 6 | ||||
-rw-r--r-- | po/Makevars | 3 | ||||
-rw-r--r-- | po/POTFILES.in | 2 |
6 files changed, 27 insertions, 21 deletions
diff --git a/Makefile.am b/Makefile.am index e0f3ded7..d5f8fbd5 100644 --- a/Makefile.am +++ b/Makefile.am @@ -24,6 +24,8 @@ endif man_MANS = update-mime-database.1 +ITS_FILES = its/shared-mime-info.loc its/shared-mime-info.its + EXTRA_DIST = \ shared-mime-info-spec.xml \ freedesktop.org.xml.in \ @@ -32,28 +34,17 @@ EXTRA_DIST = \ README \ HACKING \ $(man_MANS) \ - shared-mime-info.pc.in \ - shared-mime-info.pot \ - mime-info.its + $(ITS_FILES) \ + shared-mime-info.pc.in CLEANFILES = freedesktop.org.xml po/stamp-it -MAINTAINERCLEANFILES = shared-mime-info.pot pkgconfigdir = $(datadir)/pkgconfig pkgconfig_DATA = shared-mime-info.pc $(pkgconfig_DATA): config.status -all-recursive: shared-mime-info.pot - -shared-mime-info.pot: freedesktop.org.xml.in mime-info.its - $(AM_V_GEN)$(ITSTOOL) -i $(srcdir)/mime-info.its -o $@ $< - test "$(srcdir)" = . || cp shared-mime-info.pot $(srcdir)/shared-mime-info.pot - -po/shared-mime-info.pot: shared-mime-info.pot - $(MAKE) -C po shared-mime-info.pot - -freedesktop.org.xml: freedesktop.org.xml.in shared-mime-info.pot +freedesktop.org.xml: freedesktop.org.xml.in $(MAKE) -C po update-gmo $(AM_V_GEN)$(ITSTOOL) -j $< -o $@ $(top_srcdir)/po/*.gmo @@ -89,6 +80,9 @@ all: $(defaultmakedeps) XDGMIME_PATH=@XDGMIME_PATH@ +po/shared-mime-info.pot: + make -C po shared-mime-info.pot + local-test: po/shared-mime-info.pot freedesktop.org.xml update-mime-database$(EXEEXT) if CROSS_COMPILING @echo "Cross compiling: Skipping checks" diff --git a/its/shared-mime-info.its b/its/shared-mime-info.its new file mode 100644 index 00000000..e504a273 --- /dev/null +++ b/its/shared-mime-info.its @@ -0,0 +1,9 @@ +<?xml version="1.0"?> +<its:rules xmlns:its="http://www.w3.org/2005/11/its" + xmlns:gt="https://www.gnu.org/s/gettext/ns/its/extensions/1.0" + xmlns:mi="http://www.freedesktop.org/standards/shared-mime-info" + version="2.0"> + <its:translateRule translate="yes" selector="//mi:comment"/> + <its:translateRule translate="no" selector="//mi:expanded-acronym"/> + <its:translateRule translate="no" selector="//mi:acronym"/> +</its:rules> diff --git a/its/shared-mime-info.loc b/its/shared-mime-info.loc new file mode 100644 index 00000000..a6f7f409 --- /dev/null +++ b/its/shared-mime-info.loc @@ -0,0 +1,6 @@ +<?xml version="1.0"?> +<locatingRules> + <locatingRule name="shared-mime-info" pattern="*.xml"> + <documentRule localName="mime-info" target="shared-mime-info.its"/> + </locatingRule> +</locatingRules> diff --git a/mime-info.its b/mime-info.its deleted file mode 100644 index ffe4b179..00000000 --- a/mime-info.its +++ /dev/null @@ -1,6 +0,0 @@ -<its:rules version="2.0" - xmlns:its="http://www.w3.org/2005/11/its" - xmlns:mi="http://www.freedesktop.org/standards/shared-mime-info"> - <its:translateRule translate="no" selector="//mi:expanded-acronym"/> - <its:translateRule translate="no" selector="//mi:acronym"/> -</its:rules> diff --git a/po/Makevars b/po/Makevars index b5da6bcc..ec459209 100644 --- a/po/Makevars +++ b/po/Makevars @@ -7,6 +7,9 @@ DOMAIN = $(PACKAGE) subdir = po top_builddir = .. +# This allows us using local its files +XGETTEXT := env GETTEXTDATADIRS="$(top_srcdir)/" $(XGETTEXT) + # These options get passed to xgettext. XGETTEXT_OPTIONS = --keyword=_ --keyword=N_ diff --git a/po/POTFILES.in b/po/POTFILES.in index 6f9935af..88fa57bd 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -1 +1 @@ -shared-mime-info.pot +freedesktop.org.xml.in |