desktop: make the appstream metainfo file translatable.

To have the name and summary translatable, rename as .in file, add
underscore on localizable tags and add to POTFILES.in.
Also clean out trailing whitespace and weird characters, add indentation
and fix tag s/updatecontact/update_contact/.
Finally add an appstream-util validation so that the file syntax is
checked during a `make check`.
This commit is contained in:
Jehan
2017-06-17 04:31:22 +02:00
parent dc17194fca
commit 60f09c3482
5 changed files with 28 additions and 29 deletions

View File

@ -3,10 +3,8 @@
desktop_in_files = gimp.desktop.in.in desktop_in_files = gimp.desktop.in.in
desktop_files = $(desktop_in_files:.desktop.in.in=.desktop) desktop_files = $(desktop_in_files:.desktop.in.in=.desktop)
appdata_in_files = gimp.appdata.xml.in appstream_in_files = gimp.appdata.xml.in gimp-data-extras.metainfo.xml.in
appdata_files = \ appstream_files = $(appstream_in_files:.xml.in=.xml)
$(appdata_in_files:.appdata.xml.in=.appdata.xml) \
gimp-data-extras.metainfo.xml
if DESKTOP_DATADIR if DESKTOP_DATADIR
@ -14,7 +12,7 @@ applicationsdir = $(DESKTOP_DATADIR)/applications
applications_DATA = $(desktop_files) applications_DATA = $(desktop_files)
appdatadir = $(DESKTOP_DATADIR)/appdata appdatadir = $(DESKTOP_DATADIR)/appdata
appdata_DATA = $(appdata_files) appdata_DATA = $(appstream_files)
icons16dir = $(DESKTOP_DATADIR)/icons/hicolor/16x16/apps icons16dir = $(DESKTOP_DATADIR)/icons/hicolor/16x16/apps
icons16_DATA = 16x16/gimp.png icons16_DATA = 16x16/gimp.png
@ -42,19 +40,19 @@ install-data-hook:
endif endif
EXTRA_DIST = \ EXTRA_DIST = \
$(appdata_in_files) \ $(appstream_in_files) \
test-appdata.sh \ test-appdata.sh \
gimp.desktop.in.in \ gimp.desktop.in.in \
16x16/gimp.png \ 16x16/gimp.png \
22x22/gimp.png \ 22x22/gimp.png \
24x24/gimp.png \ 24x24/gimp.png \
32x32/gimp.png \ 32x32/gimp.png \
48x48/gimp.png \ 48x48/gimp.png \
64x64/gimp.png \ 64x64/gimp.png \
256x256/gimp.png 256x256/gimp.png
DISTCLEANFILES = $(desktop_files) $(appdata_files) DISTCLEANFILES = $(desktop_files) $(appstream_files)
@INTLTOOL_XML_RULE@ @INTLTOOL_XML_RULE@

View File

@ -1,14 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Copyright 2015 Jiri Eischmann <eischmann@redhat.com>
-->
<component type="addon">
<id>gimp-data-extras</id>
<extends>gimp.desktop</extends>
<name>Extra files for GIMP</name>
<summary>Patterns, gradients, and other extra files for GIMP</summary>
<url type="homepage">http://www.gimp.org/</url>
<url type="bugtracker">https://bugzilla.gnome.org/enter_bug.cgi?product=GIMP</url>
<metadata_license>CC0-1.0</metadata_license>
<project_license>GPL-3.0+</project_license>
<updatecontact>alexandre.prokoudine@gmail.com</updatecontact>
</component>

View File

@ -0,0 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Copyright 2015 Jiri Eischmann <eischmann@redhat.com> -->
<component type="addon">
<id>gimp-data-extras</id>
<extends>gimp.desktop</extends>
<_name>Extra files for GIMP</_name>
<_summary>Patterns, gradients, and other extra files for GIMP</_summary>
<url type="homepage">http://www.gimp.org/</url>
<url type="bugtracker">https://bugzilla.gnome.org/enter_bug.cgi?product=GIMP</url>
<metadata_license>CC0-1.0</metadata_license>
<project_license>GPL-3.0+</project_license>
<update_contact>alexandre.prokoudine@gmail.com</update_contact>
</component>

View File

@ -1,3 +1,4 @@
#!/bin/sh #!/bin/sh
appstream-util validate-strict ${GIMP_TESTING_ABS_TOP_SRCDIR}/desktop/gimp.appdata.xml.in appstream-util validate-strict ${GIMP_TESTING_ABS_TOP_SRCDIR}/desktop/gimp.appdata.xml.in
appstream-util validate-strict ${GIMP_TESTING_ABS_TOP_SRCDIR}/desktop/gimp-data-extras.metainfo.xml.in

View File

@ -4,6 +4,7 @@
[encoding: UTF-8] [encoding: UTF-8]
desktop/gimp.appdata.xml.in desktop/gimp.appdata.xml.in
desktop/gimp-data-extras.metainfo.xml.in
desktop/gimp.desktop.in.in desktop/gimp.desktop.in.in
app/about.h app/about.h