diff options
author | Danilo Šegan <danilo@src.gnome.org> | 2005-04-01 21:24:47 +0000 |
---|---|---|
committer | Danilo Šegan <danilo@src.gnome.org> | 2005-04-01 21:24:47 +0000 |
commit | 623af4a5d85dc69a7cde660f62fc596e6391925c (patch) | |
tree | 08e58211652b16e4259c73edf6f3dcaafc205b1b | |
parent | 776600a08f9c3ed6aa65bda163d86ec3cbba209c (diff) | |
download | gnome-doc-utils-623af4a5d85dc69a7cde660f62fc596e6391925c.tar.gz |
Fix handling of UTF-8 in original strings.
-rw-r--r-- | xml2po/ChangeLog | 1 | ||||
-rwxr-xr-x | xml2po/xml2po.py | 14 |
2 files changed, 7 insertions, 8 deletions
diff --git a/xml2po/ChangeLog b/xml2po/ChangeLog index 3084802..539cb94 100644 --- a/xml2po/ChangeLog +++ b/xml2po/ChangeLog @@ -1,7 +1,6 @@ 2005-04-01 Danilo Šegan <dsegan@gmx.net> * xml2po.py (getTranslation): decode lookup string from utf-8. - Make all .serialize() actually .serialize('utf-8') 2005-03-27 Danilo Šegan <dsegan@gmx.net> diff --git a/xml2po/xml2po.py b/xml2po/xml2po.py index bf466cb..00f7e1e 100755 --- a/xml2po/xml2po.py +++ b/xml2po/xml2po.py @@ -141,7 +141,7 @@ def normalizeString(text, ignorewhitespace = 1): try: # Lets add document DTD so entities are resolved dtd = doc.intSubset() - tmp = dtd.serialize('utf-8') + tmp = dtd.serialize() tmp = tmp + '<norm>%s</norm>' % text except: tmp = '<norm>%s</norm>' % text @@ -172,11 +172,11 @@ def normalizeString(text, ignorewhitespace = 1): def stringForEntity(node): """Replaces entities in the node.""" - text = node.serialize('utf-8') + text = node.serialize() try: # Lets add document DTD so entities are resolved dtd = node.doc.intSubset() - tmp = dtd.serialize('utf-8') + '<norm>%s</norm>' % text + tmp = dtd.serialize() + '<norm>%s</norm>' % text next = 1 except: tmp = '<norm>%s</norm>' % text @@ -233,7 +233,7 @@ def startTagForNode(node): for p in node.properties: if p.type == 'attribute': # FIXME: This part sucks - params += p.serialize('utf-8') + params += p.serialize() return result+params def endTagForNode(node): @@ -313,7 +313,7 @@ def replaceNodeContentsWithText(node,text): dtd = doc.intSubset() tmp = '' if expand_entities: # FIXME: we get a "Segmentation fault" in libxml2.parseMemory() when we include DTD otherwise - tmp = dtd.serialize('utf-8') + tmp = dtd.serialize() tmp = tmp + '<%s>%s</%s>' % (starttag, text, endtag) except: tmp = '<%s>%s</%s>' % (starttag, text, endtag) @@ -461,12 +461,12 @@ def doSerialize(node): if ignoreNode(node): return '' elif not node.children: - return node.serialize('utf-8') + return node.serialize("utf-8") elif node.type == 'entity_ref': if isExternalGeneralParsedEntity(node): return node.serialize('utf-8') else: - return stringForEntity(node) #content #content #serialize() + return stringForEntity(node) #content #content #serialize("utf-8") elif node.type == 'entity_decl': return node.serialize('utf-8') #'<%s>%s</%s>' % (startTagForNode(node), node.content, node.name) elif node.type == 'text': |