Merge pull request #110 from transifex/devel_copy

Fix xliff:g tag escaping in android xml
transifex · Aug 21, 2018 · ddbc3a6 · ddbc3a6
2 parents d789bdf + a7be0f6
commit ddbc3a6
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/openformats/formats/android.py b/openformats/formats/android.py
@@ -567,7 +567,7 @@ def _should_ignore(child):
     # According to:
     # http://developer.android.com/guide/topics/resources/string-resource.html#FormattingAndStyling  # noqa
 
-    INLINE_TAGS = ("xliff\:g", "a")
+    INLINE_TAGS = ("xliff:g", "a", "annotation")
 
     @staticmethod
     def escape(string):

diff --git a/openformats/tests/formats/android/test_android.py b/openformats/tests/formats/android/test_android.py
@@ -811,6 +811,13 @@ def test_escape(self):
             # Single tags
             (u'<a b="c" />', u'<a b="c" />'),
             (u'<x y="z" />', u'<x y=\\"z\\" />'),
+            # xliff:g tag
+            (u'<xliff:g y="z">hello</xliff:g>',
+             u'<xliff:g y="z">hello</xliff:g>'),
+            # annotation tag
+            (u'<annotation y="z">hello</annotation>',
+             u'<annotation y="z">hello</annotation>'),
+
         )
         for rich, raw in cases:
             self.assertEquals(AndroidHandler.escape(bytes_to_string(rich)),