Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Fixed #4539 -- Fixed a subtle context resolving bug in the i18n templ…

…ate tag.

Excellent debugging from permonik@mesias.brnonet.cz.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@7261 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit e461e737d3843735a316e815cd0afe1b88433e88 1 parent b5adaec
@malcolmt malcolmt authored
Showing with 5 additions and 2 deletions.
  1. +5 −2 django/templatetags/i18n.py
View
7 django/templatetags/i18n.py
@@ -66,9 +66,12 @@ def render_token_list(self, tokens):
return ''.join(result), vars
def render(self, context):
- context.push()
+ tmp_context = {}
for var, val in self.extra_context.items():
- context[var] = val.render(context)
+ tmp_context[var] = val.render(context)
+ # Update() works like a push(), so corresponding context.pop() is at
+ # the end of function
+ context.update(tmp_context)
singular, vars = self.render_token_list(self.singular)
if self.plural and self.countervar and self.counter:
count = self.counter.resolve(context)
Please sign in to comment.
Something went wrong with that request. Please try again.