Percent signs escaping in templatetags

django_babel/extract.py

@@ -1,8 +1,17 @@
 # -*- coding: utf-8 -*-
-from django.template.base import Lexer, TOKEN_TEXT, TOKEN_VAR, TOKEN_BLOCK
+from django.template.base import Lexer
 from django.utils.translation import trim_whitespace
 from django.utils.encoding import smart_text
 
+try:
+    from django.template.base import TOKEN_TEXT, TOKEN_VAR, TOKEN_BLOCK
+except ImportError:
+    # Django 2.1+
+    from django.template.base import TokenType
+    TOKEN_TEXT = TokenType.TEXT
+    TOKEN_VAR = TokenType.VAR
+    TOKEN_BLOCK = TokenType.BLOCK
+
 try:
     from django.utils.translation.trans_real import (
         inline_re, block_re, endblock_re, plural_re, constant_re)
@@ -11,6 +20,12 @@
     from django.utils.translation.template import (
         inline_re, block_re, endblock_re, plural_re, constant_re)
 
+try:
+    from django.utils.translation.trans_real import one_percent_re
+except ImportError:
+    # Django 1.9+
+    one_percent_re = None
+
 
 def join_tokens(tokens, trim=False):
     message = ''.join(tokens)
@@ -112,10 +127,14 @@ def extract_django(fileobj, keywords, comment_tags, options):
                 else:
                     singular.append('%%(%s)s' % t.contents)
             elif t.token_type == TOKEN_TEXT:
+                if one_percent_re:
+                    contents = one_percent_re.sub('%%', t.contents)
+                else:
+                    contents = t.contents.replace('%', '%%')
                 if inplural:
-                    plural.append(t.contents)
+                    plural.append(contents)
                 else:
-                    singular.append(t.contents)
+                    singular.append(contents)
         else:
             if t.token_type == TOKEN_BLOCK:
                 imatch = inline_re.match(t.contents)
@@ -124,6 +143,10 @@ def extract_django(fileobj, keywords, comment_tags, options):
                 if imatch:
                     g = imatch.group(1)
                     g = strip_quotes(g)
+                    if one_percent_re:
+                        g = one_percent_re.sub('%%', g)
+                    else:
+                        g = g.replace('%', '%%')
                     message_context = imatch.group(3)
                     if message_context:
                         # strip quotes

tests/test_extract.py

@@ -218,3 +218,33 @@ def test_blocktrans_with_whitespace_trimmed(self):
         buf = BytesIO(test_tmpl)
         messages = list(extract_django(buf, default_keys, [], {}))
         self.assertEqual([(4, None, u'foo bar', [])], messages)
+
+    @pytest.mark.skipif(django.VERSION >= (1, 9),
+                        reason='%-sign escaping changed in django 1.9')
+    def test_extract_trans_percents_old_way(self):
+        """Before Django 1.9, only a signle %-sign was escaped to %%"""
+        buf = BytesIO(b'{% trans "1 %, 2 %%, 3 %%%" %}')
+        messages = list(extract_django(buf, default_keys, [], {}))
+        self.assertEqual([(1, None, u'1 %%, 2 %%, 3 %%%', [])], messages)
+
+    @pytest.mark.skipif(django.VERSION >= (1, 9),
+                        reason='%-sign escaping changed in django 1.9')
+    def test_extract_blocktrans_percents_old_way(self):
+        """Before Django 1.9, only a signle %-sign was escaped to %%"""
+        buf = BytesIO(b'{% blocktrans %}1 %, 2 %%, 3 %%%{% endblocktrans %}')
+        messages = list(extract_django(buf, default_keys, [], {}))
+        self.assertEqual([(1, None, u'1 %%, 2 %%, 3 %%%', [])], messages)
+
+    @pytest.mark.skipif(django.VERSION < (1, 9),
+                        reason='%-sign escaping changed in django 1.9')
+    def test_extract_trans_percents(self):
+        buf = BytesIO(b'{% trans "1 %, 2 %%, 3 %%%" %}')
+        messages = list(extract_django(buf, default_keys, [], {}))
+        self.assertEqual([(1, None, u'1 %%, 2 %%%%, 3 %%%%%%', [])], messages)
+
+    @pytest.mark.skipif(django.VERSION < (1, 9),
+                        reason='%-sign escaping changed in django 1.9')
+    def test_extract_blocktrans_percents(self):
+        buf = BytesIO(b'{% blocktrans %}1 %, 2 %%, 3 %%%{% endblocktrans %}')
+        messages = list(extract_django(buf, default_keys, [], {}))
+        self.assertEqual([(1, None, u'1 %%, 2 %%%%, 3 %%%%%%', [])], messages)