[gen] Bugfixin the sync of i18n files; allow to include XHTML within messages in Appy popups.

2014-03-26 14:01:03 +01:00 · 2014-03-26 14:01:03 +01:00 · d5a9450d72
commit d5a9450d72
parent 834817c27b
3 changed files with 9 additions and 3 deletions
--- a/gen/generator.py
+++ b/gen/generator.py
@ -449,8 +449,9 @@ class ZopeGenerator(Generator):
                baseLabels = po.PoParser(appyPoFileName).parse().messages
            else:
                baseLabels = appyLabels
-            poFile.update(baseLabels + self.labels.get(),
-                self.options.i18nClean, keepExistingOrder=False)
+            poFile.update(baseLabels + self.labels.get() + \
+                          potFile.getCustomMessages(), self.options.i18nClean,
+                          keepExistingOrder=False)
            poFile.generate()
        # Generate corresponding fields on the Translation class
        page = '1'