From 3c208d1cca091934ba28a3a86948ad362f9e1e1e Mon Sep 17 00:00:00 2001 From: Luke Plant Date: Mon, 13 Dec 2010 13:41:12 +0000 Subject: [PATCH] [1.2.X] Reverted [13998] because it never worked. Refs #5425, #14844 Backport of [14897] from trunk. git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14898 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- django/contrib/admin/templates/admin/pagination.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/django/contrib/admin/templates/admin/pagination.html b/django/contrib/admin/templates/admin/pagination.html index 5a0f65a93f..358813290c 100644 --- a/django/contrib/admin/templates/admin/pagination.html +++ b/django/contrib/admin/templates/admin/pagination.html @@ -6,7 +6,7 @@ {% paginator_number cl i %} {% endfor %} {% endif %} -{% 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 %} +{{ cl.result_count }} {% ifequal cl.result_count 1 %}{{ cl.opts.verbose_name }}{% else %}{{ cl.opts.verbose_name_plural }}{% endifequal %} {% if show_all_url %}  {% trans 'Show all' %}{% endif %} {% if cl.formset and cl.result_count %}{% endif %}