openstack
/
deb-python-django-babel
Code Issues Proposed changes

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

Strip quotes from translations via _()
This commit is contained in:
Thomas Grainger 2016-03-02 15:32:54 +00:00
parent 42493cb708 00e92e7622
commit 05d906c2f4
3 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
django_babel/extract.py
View File

@ -10,6 +10,12 @@ from django.utils.translation.trans_real import (
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,19 +131,22 @@ 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]
@ -148,8 +154,5 @@ def extract_django(fileobj, keywords, comment_tags, options):
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), []

1
django_babel/templatetags/babel.py
View File

@ -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

8
tests/test_extract.py
View File

@ -154,17 +154,17 @@ class ExtractDjangoTestCase(unittest.TestCase):
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 @@ class ExtractDjangoTestCase(unittest.TestCase):
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,
)