From 5319f285a669c0012f07a37352dd6addd4da5509 Mon Sep 17 00:00:00 2001 From: Georg Bauer Date: Mon, 14 Nov 2005 13:29:38 +0000 Subject: [PATCH] fixes bug with blocktrans and parameters not actually doing the translation (thx. nesh for the report) git-svn-id: http://code.djangoproject.com/svn/django/trunk@1230 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- django/templatetags/i18n.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/django/templatetags/i18n.py b/django/templatetags/i18n.py index e9702f2dc3..8873586c24 100644 --- a/django/templatetags/i18n.py +++ b/django/templatetags/i18n.py @@ -62,11 +62,11 @@ class BlockTranslateNode(Node): context.push() for var,val in self.extra_context.items(): context[var] = resolve_variable_with_filters(val, context) - singular = self.render_token_list(self.singular) % context + singular = self.render_token_list(self.singular) if self.plural and self.countervar and self.counter: count = resolve_variable_with_filters(self.counter, context) context[self.countervar] = count - plural = self.render_token_list(self.plural) % context + plural = self.render_token_list(self.plural) result = translation.ngettext(singular, plural, count) % context else: result = translation.gettext(singular) % context