sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-12-07 00:03:52 -05:00
Code Issues Packages Projects Releases Wiki Activity

appdata: be mindful of the xml elements depth when translating

Browse Source 
We were doing a deep search for "name" which happened for the component
name _and_ and the developer name, which is in a deeper tag.
Instead of doing a deep search, just look for the elements we care about
among the component element's children.

Fixes this error from appstreamcli:
org.qgis.qgis.metainfo.xml
  E: org.qgis.qgis.desktop:88: tag-duplicated name (lang=de)
  E: org.qgis.qgis.desktop:88: tag-duplicated name (lang=hu)
  E: org.qgis.qgis.desktop:88: tag-duplicated name (lang=lt)
  E: org.qgis.qgis.desktop:88: tag-duplicated name (lang=nb)
  E: org.qgis.qgis.desktop:88: tag-duplicated name (lang=zh-Hans)
This commit is contained in:
Aleix Pol 2024-06-26 03:03:32 +02:00 committed by Nyall Dawson
parent a3391e6ea6
commit 144db4bc70
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
scripts/ts2appinfo.py.in
View File

@ -29,8 +29,9 @@ strings = {}
d = et.parse('linux/org.qgis.qgis.appdata.xml.in')
r = d.getroot()
for elem in ['name', 'summary', 'description']:
for c in r.iter(elem):
valuesNeeded = ['name', 'summary', 'description']
for c in r:
if c.tag in valuesNeeded:
if not c.attrib:
l = list(c)
t = c.text if not l else "".join([et.tostring(x).decode("utf-8") for x in l])
@ -68,8 +69,9 @@ for qm in sorted(glob(sys.argv[1] + "/output/i18n/qgis_*.qm")):
continue
strings[s][lang] = translation
for elem in ['name', 'summary']:
for c in r.iter(elem):
valuesOffered = ['name', 'summary']
for c in r:
if c.tag in valuesOffered:
if c.attrib:
continue
@ -77,7 +79,7 @@ for elem in ['name', 'summary']:
s = c.text if not l else "".join([et.tostring(x).decode("utf-8") for x in l])
for lang in strings[s]:
e = et.Element(elem, attrib={"xml:lang": lang})
e = et.Element(c.tag, attrib={"xml:lang": lang})
e.text = strings[s][lang]
e.tail = c.tail
r.append(e)