po2resx - Fixing an issue around comments being duplicated if there i…

…s leading or trailing whitespace. Added unit test to cover this scenario.
translate · May 11, 2015 · b880dce · b880dce
1 parent 40ab1e7
commit b880dce
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 4 deletions.
diff --git a/translate/convert/test_po2resx.py b/translate/convert/test_po2resx.py
@@ -285,6 +285,23 @@ def test_automaticcomments_existingduplicatecomment(self):
         resx_file = self.po2resx(resx_template, po_source)
         assert resx_file == expected_output
 
+    def test_automaticcomments_existingduplicatecommentwithwhitespace(self):
+        """ Tests there is no duplication of automatic comments if it already exists, hasn't changed but has leading or
+        trailing whitespaces """
+        po_source = r'''#.  This is an existing comment with leading and trailing spaces
+#: ResourceKey
+msgid "Bézier curve"
+msgstr "Bézier-kurwe"
+'''
+        resx_template = self.XMLskeleton % '''<data name="ResourceKey" xml:space="preserve">
+        <value></value>
+        <comment> This is an existing comment with leading and trailing spaces </comment></data>'''
+        expected_output = self.XMLskeleton % '''<data name="ResourceKey" xml:space="preserve">
+        <value>Bézier-kurwe</value>
+    <comment>This is an existing comment with leading and trailing spaces</comment></data>'''
+        resx_file = self.po2resx(resx_template, po_source)
+        assert resx_file == expected_output
+
     def test_translatorcomments(self):
         """ Tests that translator comments are imported """
         po_source = r'''# This is a translator comment : 22.12.14
@@ -410,6 +427,7 @@ def test_existingcomments(self):
         resx_file = self.po2resx(resx_template, po_source)
         assert resx_file == expected_output
 
+
 class TestPO2TSCommand(test_convert.TestConvertCommand, TestPO2RESX):
     """ Tests running actual po2ts commands on files """
     convertmodule = po2resx

diff --git a/translate/storage/resx.py b/translate/storage/resx.py
@@ -82,14 +82,15 @@ def addnote(self, text, origin=None, position="append"):
         current_notes = self.getnotes(origin)
         self.removenotes(origin)
         note = etree.SubElement(self.xmlelement, self.namespaced("comment"))
+        text_stripped = text.strip()
         if position == "append":
-            if current_notes in text:
+            if current_notes.strip() in text_stripped:
                 # Don't add duplicate comments
-                note.text = text.strip()
+                note.text = text_stripped
             else:
-                note.text = "\n".join(filter(None, [current_notes, text.strip()]))
+                note.text = "\n".join(filter(None, [current_notes, text_stripped]))
         else:
-            note.text = text.strip()
+            note.text = text_stripped
 
     def getnotes(self, origin=None):
         comments = []