Browse files

[1.2.X] Fixed #5425 - Incorrect plurals in admin pagination template.

Thanks to Petr Marhoun for the report, and mk for the patch.

Backport of [13998] from trunk

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13999 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
1 parent 12187bf commit 01b12a6fab25a9891085acc718d52e033188d7e7 @spookylukey spookylukey committed Oct 7, 2010
Showing with 1 addition and 1 deletion.
  1. +1 −1 django/contrib/admin/templates/admin/pagination.html
View
2 django/contrib/admin/templates/admin/pagination.html
@@ -6,7 +6,7 @@
{% paginator_number cl i %}
{% endfor %}
{% endif %}
-{{ cl.result_count }} {% ifequal cl.result_count 1 %}{{ cl.opts.verbose_name }}{% else %}{{ cl.opts.verbose_name_plural }}{% endifequal %}
+{% blocktrans with cl.opts.verbose_name as verbose_name and cl.opts.verbose_name_plural as verbose_name_plural count cl.result_count as count %}{{ count }} {{ verbose_name }}{% plural %}{{ count }} {{ verbose_name_plural }}{% endblocktrans %}
{% if show_all_url %}&nbsp;&nbsp;<a href="{{ show_all_url }}" class="showall">{% trans 'Show all' %}</a>{% endif %}
{% if cl.formset and cl.result_count %}<input type="submit" name="_save" class="default" value="{% trans 'Save' %}"/>{% endif %}
</p>

0 comments on commit 01b12a6

Please sign in to comment.