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

i18n Python scripts: remove class SysL10NResourceManager from i18n.py

Browse Source 
This class isn't needed anymore now that
$FG_ROOT/Translations/default/sys.xml has a flat structure, like the
other FG XML i18n files that define the default translation. This is
related to

  6d6e1809f0/

and more specifically to

  587c601345/
This commit is contained in:
Florent Rougon 2018-10-12 08:14:01 +02:00
parent 1c5449fcd6
commit a5525ba2b3
1 changed files with 12 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
python3-flightgear/flightgear/meta/i18n.py
View File

@ -1670,10 +1670,8 @@ registerFormatHandler("xliff", XliffFormatHandler)
# Could also be a dict # Could also be a dict
def L10nResMgrForCat(category): def L10nResMgrForCat(category):
"""Map from category/resource name to L10NResourceManager class.""" """Map from category/resource name to L10NResourceManager class."""
if category in ("menu", "options", "tips"): if category in ("menu", "options", "sys", "tips"):
return BasicL10NResourceManager return BasicL10NResourceManager
elif category == "sys":
return SysL10NResourceManager
else: else:
assert False, "unexpected category: {!r}".format(category) assert False, "unexpected category: {!r}".format(category)
@ -1859,7 +1857,7 @@ class L10NResourceManagerBase:
class BasicL10NResourceManager(L10NResourceManagerBase): class BasicL10NResourceManager(L10NResourceManagerBase):
"""Resource manager for FG XML i18n files with the simplest structure. """Resource manager for FG XML i18n files with the simplest structure.
This is suitable for resources (menu, options, tips) where This is suitable for resources (menu, options, tips, etc.) where
translations are in direct children of the <PropertyList> element, translations are in direct children of the <PropertyList> element,
with no more structure. with no more structure.
@ -1867,7 +1865,16 @@ class BasicL10NResourceManager(L10NResourceManagerBase):
@classmethod @classmethod
def _findMainNode(cls, rootNode): def _findMainNode(cls, rootNode):
""" """
Return the node directly containing the translations in an FG XML file.""" Return the node directly containing the translations in an FG XML file.
This method was added when sys.xml had all its useful contents
inside a 'splash' top-level node, instead of having a flat
structure like the other FG XML i18n files (options.xml,
menu.xml, etc.). At that time, we thus had a
SysL10NResourceManager class derived from this class only to
override this method.
"""
assert rootNode.tag == "PropertyList", rootNode.tag assert rootNode.tag == "PropertyList", rootNode.tag
return rootNode return rootNode
@ -1925,17 +1932,3 @@ class BasicL10NResourceManager(L10NResourceManagerBase):
[text], isPlural=isPlural, logger=logger) [text], isPlural=isPlural, logger=logger)
return nbWhitespaceProblems return nbWhitespaceProblems
class SysL10NResourceManager(BasicL10NResourceManager):
@classmethod
def _findMainNode(cls, rootNode):
"""
Return the node directly containing the translations in sys.xml."""
assert rootNode.tag == "PropertyList", rootNode.tag
# In sys.xml, all translations are inside a <splash> element
mainNode = rootNode.find("splash")
assert mainNode is not None
return mainNode