Merge pull request #26 from tsouvarev/strip-quotes-from-constants

Strip quotes from translations via _()

Author: graingert

django_babel/extract.py

@@ -10,6 +10,12 @@
 from django.utils.encoding import smart_text
 
 
+def strip_quotes(s):
+    if (s[0] == s[-1]) and s.startswith(("'", '"')):
+        return s[1:-1]
+    return s
+
+
 def extract_django(fileobj, keywords, comment_tags, options):
     """Extract messages from Django template files.
 
@@ -107,10 +113,7 @@ def extract_django(fileobj, keywords, comment_tags, options):
                 cmatches = constant_re.findall(t.contents)
                 if imatch:
                     g = imatch.group(1)
-                    if g[0] == '"':
-                        g = g.strip('"')
-                    elif g[0] == "'":
-                        g = g.strip("'")
+                    g = strip_quotes(g)
                     message_context = imatch.group(3)
                     if message_context:
                         # strip quotes
@@ -128,28 +131,28 @@ def extract_django(fileobj, keywords, comment_tags, options):
                     if bmatch.group(2):
                         message_context = bmatch.group(2)[1:-1]
                     for fmatch in constant_re.findall(t.contents):
-                        yield lineno, None, smart_text(fmatch), []
+                        stripped_fmatch = strip_quotes(fmatch)
+                        yield lineno, None, smart_text(stripped_fmatch), []
                     intrans = True
                     inplural = False
                     singular = []
                     plural = []
                 elif cmatches:
                     for cmatch in cmatches:
-                        yield lineno, None, smart_text(cmatch), []
+                        stripped_cmatch = strip_quotes(cmatch)
+                        yield lineno, None, smart_text(stripped_cmatch), []
             elif t.token_type == TOKEN_VAR:
                 parts = t.contents.split('|')
                 cmatch = constant_re.match(parts[0])
                 if cmatch:
-                    yield lineno, None, smart_text(cmatch.group(1)), []
+                    stripped_cmatch = strip_quotes(cmatch.group(1))
+                    yield lineno, None, smart_text(stripped_cmatch), []
                 for p in parts[1:]:
                     if p.find(':_(') >= 0:
                         p1 = p.split(':', 1)[1]
                         if p1[0] == '_':
                             p1 = p1[1:]
                         if p1[0] == '(':
                             p1 = p1.strip('()')
-                        if p1[0] == "'":
-                            p1 = p1.strip("'")
-                        elif p1[0] == '"':
-                            p1 = p1.strip('"')
+                        p1 = strip_quotes(p1)
                         yield lineno, None, smart_text(p1), []

django_babel/templatetags/babel.py

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+from __future__ import absolute_import
 
 from babel import support as babel_support
 from babel import core as babel_core

tests/test_extract.py

@@ -154,17 +154,17 @@ def test_extract_filters_default_translatable_single_quotes(self):
     def test_extract_constant_single_quotes(self):
         buf = BytesIO(b"{{ _('constant') }}")
         messages = list(extract_django(buf, default_keys, [], {}))
-        self.assertEqual([(1, None, u"'constant'", [])], messages)
+        self.assertEqual([(1, None, u'constant', [])], messages)
 
     def test_extract_constant_double_quotes(self):
         buf = BytesIO(b'{{ _("constant") }}')
         messages = list(extract_django(buf, default_keys, [], {}))
-        self.assertEqual([(1, None, u'"constant"', [])], messages)
+        self.assertEqual([(1, None, u'constant', [])], messages)
 
     def test_extract_constant_block(self):
         buf = BytesIO(b'{% _("constant") %}')
         messages = list(extract_django(buf, default_keys, [], {}))
-        self.assertEqual([(1, None, u'"constant"', [])], messages)
+        self.assertEqual([(1, None, u'constant', [])], messages)
 
     def test_extract_constant_in_block(self):
         test_tmpl = (
@@ -173,7 +173,7 @@ def test_extract_constant_in_block(self):
         buf = BytesIO(test_tmpl)
         messages = list(extract_django(buf, default_keys, [], {}))
         self.assertEqual(
-            [(1, None, u'"constant"', []), (1, None, u'%(foo)s', [])],
+            [(1, None, u'constant', []), (1, None, u'%(foo)s', [])],
             messages,
         )