Merge pull request #31 from transifex/code_migration_fixes

Fix blocktrans with double quotes

Author: Konstantinos Bairaktaris

tests/native/django/test_commands/test_migratetransifex.py

@@ -293,7 +293,7 @@ def test_backup_save_string_review(mock_find_files, mock_read,
                       StringReviewPolicy)
 
     assert mock_prompt_file.call_count == 0
-    assert mock_prompt_string.call_count == 11  # 11 migrated strings
+    assert mock_prompt_string.call_count == 13  # 11 migrated strings
 
     # The path and content that reached the save object
     # should have the correct values, one for the backup and one for
@@ -334,7 +334,7 @@ def test_replace_save_string_review(mock_find_files, mock_read,
                       StringReviewPolicy)
 
     assert mock_prompt_file.call_count == 0
-    assert mock_prompt_string.call_count == 11
+    assert mock_prompt_string.call_count == 13
 
     # The path and content that reached the save object
     # should have the correct values

tests/native/django/test_tools/test_migrations/test_templatetags.py

@@ -45,6 +45,8 @@
 {% blocktrans %}
     try with <xml>xml</xml>
 {% endblocktrans %}
+{% blocktrans with organization_name=organization.name %}Help "{{organization_name}}" translate content {% endblocktrans %}
+{% blocktrans %}To download, please click <a href="https://{{ site_domain }}{{ url }}">here</a>.{% endblocktrans %}
 
 {% comment "Optional note" %}
     <p>Commented out text with {{ create_date|date:"c" }}</p>
@@ -99,6 +101,8 @@
 {% ut %}
     try with <xml>xml</xml>
 {% endut %}
+{% ut 'Help "{organization_name}" translate content ' organization_name=organization.name %}
+{% ut 'To download, please click <a href="https://{site_domain}{url}">here</a>.' %}
 
 {% comment "Optional note" %}
     <p>Commented out text with {{ create_date|date:"c" }}</p>

transifex/native/django/tools/migrations/templatetags.py

@@ -281,7 +281,7 @@ def _parse_token(self, token, parser, original_string):
         # A variable was found; copy as is
         elif token.token_type == TOKEN_VAR:
             # that's a special case we need to take care of:
-            # {{ _("Are you sure you want to remove the ($(collaborator_count)) selected collaborators?")|escapejs }}
+            # {{ _("Are you sure you want to remove the ($(collaborator_count)) selected collaborators?")|escapejs }}  # noqa
             if token.contents.startswith('_('):
                 token.token_type = TOKEN_BLOCK
                 clos_par_pos = 0
@@ -524,7 +524,7 @@ def _parse_blocktrans(self, token, parser, original_string):
         self._comment = None
 
         # Build the template of the tag for Transifex Native syntax
-        is_multiline = '\n' in singular_text or plural_text
+        is_multiline = '\n' in singular_text or '\n' in plural_text
         content = _make_plural(singular_text, plural_text, counter_var)
 
         # Source strings that contain XML symbols should use 'ut'. We determine
@@ -539,21 +539,29 @@ def _parse_blocktrans(self, token, parser, original_string):
         else:
             tag_name = "t"
 
+        has_apos, has_quot = "'" in content, '"' in content
+        use_block = is_multiline or (has_apos and has_quot)
+        if not use_block and has_quot:
+            surround_with = "'"
+        else:
+            surround_with = '"'
+
         # Render the final output
         t_tag = ['{% ', tag_name]
-        if is_multiline or '"' in content:
-            if blocktrans_node.trimmed:
+
+        if not use_block:
+            t_tag.extend([' ', surround_with, content, surround_with])
+        if blocktrans_node.trimmed:
+            if use_block:
                 t_tag.append(' |trimmed')
-        else:
-            t_tag.extend([' "', content, '"'])
-            if blocktrans_node.trimmed:
+            else:
                 t_tag.append('|trimmed')
         if params.strip():
             t_tag.extend([' ', params])
         if blocktrans_node.asvar:
             t_tag.extend([' as ', blocktrans_node.asvar])
         t_tag.append(' %}')
-        if is_multiline:
+        if use_block:
             t_tag.extend([content, '{% end', tag_name, ' %}'])
         t_tag = ''.join(t_tag)