KeyError raised in template rendering when the number of placeholders differs between singular and plural

[deltoide]

Here is a simple example to reproduce the bug:

template file: index.html

{% load i18n %}

{% blocktrans with myextra_field as extra_field and myamount as amount count myyears as years %}
That will cost $ {{ amount }} per year. {{ extra_field }}
{% plural %}
That will cost $ {{ amount }} per {{ years }} years.
{% endblocktrans %}

views.py:

from django.http import HttpResponse
from django.template import Context, loader
from django.http import HttpResponse
def index(request):
    t = loader.get_template('index.html')
    c = Context({
          'myamount' : 10,
          'myyears' : 1,
          'myextra_field' : 2,
    })
    return HttpResponse(t.render(c))

[deltoide]

Fix + regression test

[deltoide]

Fix + regression test (with link to this bug 13568)

[Jannis Leidel]

(In [13967]) Fixed #13568 -- Fixed the blocktrans tag to not raise a KeyError if the number of variables in the singular and the plural block differ. Thanks, deloide.

[Jannis Leidel]

(In [13973]) [1.2.X] Fixed #13568 -- Fixed the blocktrans tag to not raise a KeyError if the number of variables in the singular and the plural block differ. Thanks, deloide.

Backport from trunk (r13967).

[Jacob]

Milestone 1.3 deleted