Merge pull request #28 from transifex/underscore-django-template

Tackles a variety of issues raised while applying the migration script to txc

Author: candrikos

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

@@ -38,7 +38,7 @@
 {% endblocktrans %}
 
 <a href="{{ url }}">Text</a>
-{% trans some_other_var %}
+{{ _(some_other_var) }}
 {% trans some_other_var|some_filter %}
 {% trans "try as" as try %}
 {% trans "try with <xml>xml</xml>" %}

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

@@ -6,8 +6,9 @@
 
 from __future__ import unicode_literals
 
-from django.template.base import (TOKEN_COMMENT, TOKEN_TEXT, TOKEN_VAR,
-                                  TRANSLATOR_COMMENT_MARK, DebugLexer, Parser)
+from django.template.base import (TOKEN_BLOCK, TOKEN_COMMENT, TOKEN_TEXT,
+                                  TOKEN_VAR, TRANSLATOR_COMMENT_MARK,
+                                  DebugLexer, Parser)
 from django.template.defaulttags import token_kwargs
 from django.templatetags.i18n import do_block_translate, do_translate
 from django.utils.encoding import force_text
@@ -212,7 +213,6 @@ def build_migration(self, src, filename=None, charset='utf-8'):
         # the object as given.
         # Without the override, a KeyError would be raised inside the parser.
         parser.find_filter = find_filter_identity
-
         # Create a migration object for this template; we'll add stuff to it
         # as we go
         migration = FileMigration(filename, src)
@@ -280,7 +280,19 @@ def _parse_token(self, token, parser, original_string):
 
         # A variable was found; copy as is
         elif token.token_type == TOKEN_VAR:
-            return StringMigration(original_string, original_string), None
+            # that's a special case we need to take care of:
+            # {{ _("Are you sure you want to remove the ($(collaborator_count)) selected collaborators?")|escapejs }}
+            if token.contents.startswith('_('):
+                token.token_type = TOKEN_BLOCK
+                clos_par_pos = 0
+                for i, j in enumerate(token.contents):
+                    if j == ')':
+                        clos_par_pos = i
+                token.contents = ('trans ' +
+                                  token.contents[2:clos_par_pos] +
+                                  token.contents[clos_par_pos + 1:])
+            else:
+                return StringMigration(original_string, original_string), None
 
         return self._parse_block(token, parser, original_string)
 

transifex/native/django/utils/templates.py

@@ -21,6 +21,12 @@
 COPY_AS_IS = object()
 
 
+# hack to make the identity function
+# signature compatible to all template filters
+def identity(obj, var1=None, var2=None, var3=None, var4=None, var5=None):  # pragma n ocover
+    return obj  # pragma no cover
+
+
 def find_filter_identity(filter_name):
     """Return a filter that does no filtering, i.e always returns all items.
 
@@ -31,7 +37,7 @@ def find_filter_identity(filter_name):
     :return: a callable that represents a filter that does not filtering
     :rtype: callable
     """
-    return lambda obj: obj
+    return identity
 
 
 def tnode_to_source_string(tnode):
@@ -85,11 +91,11 @@ def extract_transifex_template_strings(src, origin=None, charset='utf-8'):
                 token.split_contents()[0] in ('t', 'ut')):
             tnode = do_t(parser, token)
             source_string = tnode_to_source_string(tnode)
+            if source_string is None:
+                continue
             if token.lineno and origin:
                 source_string.occurrences = [
                     "{}:{}".format(origin, token.lineno)]
-            if source_string is None:
-                continue
 
             strings.append(source_string)