Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

[1.2.X] Fixed #11966 -- Made it possible to use a percent sign in a t…

…ranslation message id. Thanks for the patch, Claude Paroz.

Backport from trunk (r14459).

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14460 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit 85f4dd6353b9254ccf1dc5b4393b028f2eb3c4ab 1 parent fca56e8
@jezdez jezdez authored
View
5 django/utils/translation/trans_real.py
@@ -439,10 +439,11 @@ def templatize(src):
else:
singular.append('%%(%s)s' % t.contents)
elif t.token_type == TOKEN_TEXT:
+ 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)
View
11 tests/regressiontests/makemessages/extraction.py
@@ -34,6 +34,17 @@ def assertNotMsgId(self, msgid, s):
return self.assert_(not re.search('^msgid "%s"' % msgid, s, re.MULTILINE))
+class TemplateExtractorTests(ExtractorTests):
+
+ def test_templatize(self):
+ os.chdir(self.test_dir)
+ management.call_command('makemessages', locale=LOCALE, verbosity=0)
+ self.assert_(os.path.exists(self.PO_FILE))
+ po_contents = open(self.PO_FILE, 'r').read()
+ self.assertMsgId('I think that 100%% is more that 50%% of anything.', po_contents)
+ self.assertMsgId('I think that 100%% is more that 50%% of %\(obj\)s.', po_contents)
+
+
class JavascriptExtractorTests(ExtractorTests):
PO_FILE='locale/%s/LC_MESSAGES/djangojs.po' % LOCALE
View
4 tests/regressiontests/makemessages/templates/test.html
@@ -1,2 +1,4 @@
{% load i18n %}
-{% trans "This literal should be included." %}
+{% trans "This literal should be included." %}
+{% blocktrans %}I think that 100% is more that 50% of anything.{% endblocktrans %}
+{% blocktrans with 'txt' as obj %}I think that 100% is more that 50% of {{ obj }}.{% endblocktrans %}
Please sign in to comment.
Something went wrong with that request. Please try again.