# HG changeset patch
# User Edouard Tisserant
# Date 1611301404 -3600
# Node ID 77cfbf1aacf0320f8daf33072b33d98d715e1b9f
# Parent  fb1e320836e85132a25d0f786c840947f832a413
SVGHMI: i18n: various fixes about unicode encoding and converting translation result back to XML to feed xslt processor

diff -r fb1e320836e8 -r 77cfbf1aacf0 svghmi/i18n.py
--- a/svghmi/i18n.py	Thu Jan 21 11:08:04 2021 +0100
+++ b/svghmi/i18n.py	Fri Jan 22 08:43:24 2021 +0100
@@ -7,6 +7,7 @@
 # See COPYING file for copyrights details.
 
 from __future__ import absolute_import
+from lxml import etree
 import os
 import sys
 import subprocess
@@ -44,7 +45,7 @@
 
     for msg in msgs:
         messages.append((
-            "\n".join([line.text.encode("utf-8") for line in msg]),
+            "\n".join([line.text for line in msg]),
             msg.get("label"), msg.get("id")))
 
     return messages
@@ -85,16 +86,17 @@
             if msg is None:
                 broken_lang.add(lang)
                 errcallback(_('{}: Missing translation for "{}" (label:{}, id:{})\n').format(lang,msgid,label,svgid))
-            translated_message.append(msg)
+                translated_message.append(msgid)
+            else:
+                translated_message.append(msg)
         translated_messages.append((msgid,translated_message))
     langs = []
     for lang,translation in translations:
         langs.append(lang)
         broken = False
         for msgid, msg in translation.iteritems():
-            if len(msgid):
-                broken = True
-                errcallback(_('{}: Unused translation "{}":"{}"\n').format(lang,msgid,msg))
+            broken = True
+            errcallback(_('{}: Unused translation "{}":"{}"\n').format(lang,msgid,msg))
         if broken or lang in broken_lang:
             errcallback(_('Translation for {} is outdated, please edit {}.po, click "Catalog -> Update from POT File..." and select messages.pot.\n').format(lang,lang))
 
@@ -103,7 +105,22 @@
 
 
 def TranslationToEtree(langs,translated_messages):
-    pass
+
+    langsroot = etree.Element("langs")
+    for lang in langs:
+        langel = etree.SubElement(langsroot, "lang")
+        langel.text = lang
+
+    msgsroot = etree.Element("translations")
+    for msgid, msgs in translated_messages:
+        msgidel = etree.SubElement(msgsroot, "msgid")
+        msgidel.text = msgid 
+        for msg in msgs:
+            msgel = etree.SubElement(msgidel, "msg")
+            msgel.text = msg 
+   
+    return [langsroot,msgsroot]
+
 
 
 locpfx = '#:svghmi.svg:'
@@ -180,8 +197,8 @@
         self.__messages = {}
 
     def ImportMessages(self, msgs):
-        for msg in msgs:
-            self.addentry(*msg)
+        for  msg, label, svgid in msgs:
+            self.addentry(msg.encode("utf-8"), label, svgid)
 
     def addentry(self, msg, label, svgid):
         entry = (label, svgid)
@@ -227,8 +244,8 @@
 
     def add(self, msgid, msgstr, fuzzy):
         "Add a non-fuzzy translation to the dictionary."
-        if not fuzzy and msgstr:
-            self.__messages[msgid] = msgstr
+        if not fuzzy and msgstr and msgid:
+            self.__messages[msgid.decode('utf-8')] = msgstr.decode('utf-8')
 
     def read(self, fp):
         ID = 1