FGFS-4.1/fgmeta
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Review feedback from Florent

Browse Source
This commit is contained in:
Automatic Release Builder
2020-06-18 10:16:06 +01:00
parent 120d02e5fb
commit c2a241c357
1 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
python3-flightgear/fg-copy-weather-scenarios-to-default-locale
View File

@@ -21,6 +21,7 @@ import argparse
import locale import locale
import os import os
import sys import sys
import re
import lxml.etree as ET import lxml.etree as ET
from catalog import sgprops from catalog import sgprops
@@ -52,30 +53,28 @@ Copy weather scenario descriptions to the default translation XML""",
# create an xml node with text content # create an xml node with text content
def make_xml_leaf(name, text): def make_xml_leaf(name, text):
leaf = ET.Element(name) leaf = ET.Element(name)
if text != None: leaf.text = '' if text is None else str(text)
if isinstance(text, (int)):
leaf.text = str(text)
else:
leaf.text = text
else:
leaf.text = ''
return leaf return leaf
simplify_cre = re.compile(r"\s+")
def simplifyString(input):
return simplify_cre.sub(" ", input.strip())
def copyWeatherScenarios(fgdata): def copyWeatherScenarios(fgdata):
environment_node = sgprops.readProps(fgdata + "/Environment/environment.xml") environment_node = sgprops.readProps(os.path.join(fgdata, "Environment", "environment.xml"))
scenarios = environment_node.getChild('weather-scenarios') scenarios = environment_node.getChild('weather-scenarios')
result = ET.Element("PropertyList") result = ET.Element("PropertyList")
for s in scenarios.getChildren("scenario"): for s in scenarios.getChildren("scenario"):
scenarioId = s.getValue("id", None) scenarioId = s.getValue("id", None)
name = s.getValue("name", None) name = simplifyString(s.getValue("name", None))
desc = s.getValue("description", None) desc = simplifyString(s.getValue("description", None))
result.append(make_xml_leaf(scenarioId + "-name", name)) result.append(make_xml_leaf(scenarioId + "-name", name))
result.append(make_xml_leaf(scenarioId + "-desc", desc)) result.append(make_xml_leaf(scenarioId + "-desc", desc))
default_trans_file = fgdata + "/Translations/default/weather-scenarios.xml" default_trans_file = os.path.join(fgdata, "Translations", "default", "weather-scenarios.xml")
doc = ET.ElementTree(result) doc = ET.ElementTree(result)
doc.write(default_trans_file, encoding='utf-8', xml_declaration=True, pretty_print=True) doc.write(default_trans_file, encoding='utf-8', xml_declaration=True, pretty_print=True)