Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

[1.2.X] Fixed #15535 -- Stopped the blocktrans template tag from rais…

…ing a KeyError if an included variable can't be found in the context. Thanks, melinath.

Backport from trunk (r15709).

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15710 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit b34a08e07019eca965d48a15caebcc9cc90b0edc 1 parent 7207481
@jezdez jezdez authored
View
2  django/templatetags/i18n.py
@@ -83,7 +83,7 @@ def render(self, context):
result = translation.ugettext(singular)
# Escape all isolated '%' before substituting in the context.
result = re.sub(u'%(?!\()', u'%%', result)
- data = dict([(v, _render_value_in_context(context[v], context)) for v in vars])
+ data = dict([(v, _render_value_in_context(context.get(v, ''), context)) for v in vars])
context.pop()
return result % data
View
3  tests/regressiontests/templates/tests.py
@@ -1138,6 +1138,9 @@ def get_template_tests(self):
# translation of singular form in russian (#14126)
'i18n27': ('{% load i18n %}{% blocktrans count number as counter %}1 result{% plural %}{{ counter }} results{% endblocktrans %}', {'number': 1, 'LANGUAGE_CODE': 'ru'}, u'1 \u0440\u0435\u0437\u0443\u043b\u044c\u0442\u0430\u0442'),
+ # blocktrans handling of variables which are not in the context.
+ 'i18n34': ('{% load i18n %}{% blocktrans %}{{ missing }}{% endblocktrans %}', {}, u''),
+
### HANDLING OF TEMPLATE_STRING_IF_INVALID ###################################
'invalidstr01': ('{{ var|default:"Foo" }}', {}, ('Foo','INVALID')),
Please sign in to comment.
Something went wrong with that request. Please try again.