Django

Code

Changeset 6689

Show
Ignore:
Timestamp:
11/17/07 21:36:03 (10 months ago)
Author:
mtredinnick
Message:

Fixed #5969 -- Corrected a problem introduced in [6682].

*sigh* As usual, the one case I forget to test turned out to be broken.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • django/trunk/django/templatetags/i18n.py

    r6682 r6689  
    7474            count = self.counter.resolve(context) 
    7575            context[self.countervar] = count 
    76             plural = self.render_token_list(self.plural)[0] 
     76            plural, vars = self.render_token_list(self.plural) 
    7777            result = translation.ungettext(singular, plural, count) 
    7878        else: 

  • django/trunk/tests/regressiontests/templates/tests.py

    r6682 r6689  
    718718 
    719719            # translation of singular form 
    720             'i18n07': ('{% load i18n %}{% blocktrans count number as counter %}singular{% plural %}plural{% endblocktrans %}', {'number': 1}, "singular"), 
     720            'i18n07': ('{% load i18n %}{% blocktrans count number as counter %}singular{% plural %}{{ counter }} plural{% endblocktrans %}', {'number': 1}, "singular"), 
    721721 
    722722            # translation of plural form 
    723             'i18n08': ('{% load i18n %}{% blocktrans count number as counter %}singular{% plural %}plural{% endblocktrans %}', {'number': 2}, "plural"), 
     723            'i18n08': ('{% load i18n %}{% blocktrans count number as counter %}singular{% plural %}{{ counter }} plural{% endblocktrans %}', {'number': 2}, "2 plural"), 
    724724 
    725725            # simple non-translation (only marking) of a string to german