openstack/openstack-doc-tools
Code Issues Proposed changes

Fix ENTITY bug with xml2po

Browse Source 
xml2po breaks the entities, readd the %openstack if needed.
Note: If more entities are imported in translated files, we need to
rework this completely.

Change-Id: Ia1a955f2cfc5810db21d68d5f9cc4374a42cebd2
Closes-Bug: #1322224
This commit is contained in:
Andreas Jaeger 2014-05-26 12:14:45 +02:00
parent 3cfe0a3fdf
commit 2af6041d17
2 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
README.rst
View File

@ -105,6 +105,7 @@ Release notes
for high-availability-guide, it is not using asciidoc anymore. for high-availability-guide, it is not using asciidoc anymore.
* New script in cleanup/retf for spell checking using the RETF rules. * New script in cleanup/retf for spell checking using the RETF rules.
patch. patch.
* Fix entity handling in ``openstack-generate-docbook``.
0.14 0.14

17
os_doc_tools/handle_pot.py
View File

@ -117,7 +117,21 @@ def mergeSingleDocument(folder, language, root):
def changeXMLLangSetting(xmlFile, language): def changeXMLLangSetting(xmlFile, language):
"""Update XML settings for file.""" """Update XML settings for file."""
dom = xml.dom.minidom.parse(xmlFile) # The mergeback breaks the ENTITIY title which should look like:
# <!DOCTYPE chapter [
# <!ENTITY % openstack SYSTEM "../common/entities/openstack.ent">
# %openstack;
# ]>
# The "%openstack;" gets removed, let's readd it first.
# NOTE(jaegerandi): This just handles the openstack ENTITY, if
# others are used, this needs to be generalized.
with open(xmlFile) as xml_file:
newxml = xml_file.read().replace(
'common/entities/openstack.ent">',
'common/entities/openstack.ent"> %openstack;')
dom = xml.dom.minidom.parseString(newxml)
root = dom.documentElement root = dom.documentElement
root.setAttribute("xml:lang", language[:2]) root.setAttribute("xml:lang", language[:2])
fileObj = codecs.open(xmlFile, "wb", encoding="utf-8") fileObj = codecs.open(xmlFile, "wb", encoding="utf-8")
@ -130,7 +144,6 @@ def changeXMLLangSetting(xmlFile, language):
node.setAttribute("xmlns:xlink", "http://www.w3.org/1999/xlink") node.setAttribute("xmlns:xlink", "http://www.w3.org/1999/xlink")
if node.hasAttribute("title"): if node.hasAttribute("title"):
node.setAttribute("xlink:title", node.getAttribute("title")) node.setAttribute("xlink:title", node.getAttribute("title"))
dom.writexml(fileObj) dom.writexml(fileObj)