diff options
| author | Malcolm Tredinnick <malcolm.tredinnick@gmail.com> | 2007-11-18 03:36:03 +0000 |
|---|---|---|
| committer | Malcolm Tredinnick <malcolm.tredinnick@gmail.com> | 2007-11-18 03:36:03 +0000 |
| commit | 5f8cfe99f3d508cfd7f3eecf50d41a3ac7e7442a (patch) | |
| tree | 784901894c70326e91ce6204b3c8f9c385c4e3f9 | |
| parent | ce73298e26b903080ae1b7e67a1a9d1ec0c5108a (diff) | |
Fixed #5969 -- Corrected a problem introduced in [6682].
*sigh* As usual, the one case I forget to test turned out to be broken.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@6689 bcc190cf-cafb-0310-a4f2-bffc1f526a37
| -rw-r--r-- | django/templatetags/i18n.py | 2 | ||||
| -rw-r--r-- | tests/regressiontests/templates/tests.py | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/django/templatetags/i18n.py b/django/templatetags/i18n.py index a2b7818eb5..b4438fdf42 100644 --- a/django/templatetags/i18n.py +++ b/django/templatetags/i18n.py @@ -73,7 +73,7 @@ class BlockTranslateNode(Node): if self.plural and self.countervar and self.counter: count = self.counter.resolve(context) context[self.countervar] = count - plural = self.render_token_list(self.plural)[0] + plural, vars = self.render_token_list(self.plural) result = translation.ungettext(singular, plural, count) else: result = translation.ugettext(singular) diff --git a/tests/regressiontests/templates/tests.py b/tests/regressiontests/templates/tests.py index 6f6667b6b0..5c3a0a9081 100644 --- a/tests/regressiontests/templates/tests.py +++ b/tests/regressiontests/templates/tests.py @@ -717,10 +717,10 @@ class Templates(unittest.TestCase): 'i18n06': ('{% load i18n %}{% trans "Page not found" %}', {'LANGUAGE_CODE': 'de'}, "Seite nicht gefunden"), # translation of singular form - 'i18n07': ('{% load i18n %}{% blocktrans count number as counter %}singular{% plural %}plural{% endblocktrans %}', {'number': 1}, "singular"), + 'i18n07': ('{% load i18n %}{% blocktrans count number as counter %}singular{% plural %}{{ counter }} plural{% endblocktrans %}', {'number': 1}, "singular"), # translation of plural form - 'i18n08': ('{% load i18n %}{% blocktrans count number as counter %}singular{% plural %}plural{% endblocktrans %}', {'number': 2}, "plural"), + 'i18n08': ('{% load i18n %}{% blocktrans count number as counter %}singular{% plural %}{{ counter }} plural{% endblocktrans %}', {'number': 2}, "2 plural"), # simple non-translation (only marking) of a string to german 'i18n09': ('{% load i18n %}{% trans "Page not found" noop %}', {'LANGUAGE_CODE': 'de'}, "Page not found"), |