Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Fixed #4982 -- Fixed handling of '%' symbols in 'blocktrans' blocks. …

…Thanks,

permonik@mesias.brnonet.cz.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@6565 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit cc6139ab50d07b4c61cf8302ebb16d764a995d9a 1 parent 3742e35
@malcolmt malcolmt authored
Showing with 6 additions and 2 deletions.
  1. +6 −2 django/templatetags/i18n.py
View
8 django/templatetags/i18n.py
@@ -1,3 +1,5 @@
+import re
+
from django.template import Node, Variable
from django.template import TemplateSyntaxError, TokenParser, Library
from django.template import TOKEN_TEXT, TOKEN_VAR
@@ -68,9 +70,11 @@ def render(self, context):
count = self.counter.resolve(context)
context[self.countervar] = count
plural = self.render_token_list(self.plural)
- result = translation.ungettext(singular, plural, count) % context
+ result = translation.ungettext(singular, plural, count)
else:
- result = translation.ugettext(singular) % context
+ result = translation.ugettext(singular)
+ # Escape all isolated '%' before substituting in the context.
+ result = re.sub('%(?!\()', '%%', result) % context
context.pop()
return result
Please sign in to comment.
Something went wrong with that request. Please try again.