Commit 11713a87 authored by Jannis Leidel's avatar Jannis Leidel
Browse files

[1.2.X] Fixed #14126 -- Fixed an issue with changes to the blocktrans tag... 

[1.2.X] Fixed #14126 -- Fixed an issue with changes to the blocktrans tag introduced in r13973 related to multiple plural forms. Thanks, mark0978, svetlyak40wt and Ramiro.

Backport from trunk (r14239).

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14240 bcc190cf-cafb-0310-a4f2-bffc1f526a37
parent 386b6811

django/templatetags/i18n.py

+1 −2
Original line number Diff line number Diff line
@@ -78,8 +78,7 @@ class BlockTranslateNode(Node): 
            context[self.countervar] = count

            plural, plural_vars = self.render_token_list(self.plural)

            result = translation.ungettext(singular, plural, count)

            if count != 1:

                vars = plural_vars

            vars.extend(plural_vars)

        else:

            result = translation.ugettext(singular)

        # Escape all isolated '%' before substituting in the context.

tests/regressiontests/templates/tests.py

+3 −0
Original line number Diff line number Diff line
@@ -1119,6 +1119,9 @@ class Templates(unittest.TestCase): 
            # translation of plural form with extra field in singular form (#13568)

            'i18n26': ('{% load i18n %}{% blocktrans with myextra_field as extra_field count number as counter %}singular {{ extra_field }}{% plural %}plural{% endblocktrans %}', {'number': 1, 'myextra_field': 'test'}, "singular test"),



            # 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'),



            ### HANDLING OF TEMPLATE_STRING_IF_INVALID ###################################



            'invalidstr01': ('{{ var|default:"Foo" }}', {}, ('Foo','INVALID')),