diff --git a/wpadmin/menu/items.py b/wpadmin/menu/items.py index 784f88f..182d1c7 100644 --- a/wpadmin/menu/items.py +++ b/wpadmin/menu/items.py @@ -1,7 +1,7 @@ import re from django.utils.text import capfirst -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from wpadmin.menu.utils import UserTestElementMixin, AppListElementMixin diff --git a/wpadmin/menu/menus.py b/wpadmin/menu/menus.py index abe070e..13f051c 100644 --- a/wpadmin/menu/menus.py +++ b/wpadmin/menu/menus.py @@ -1,4 +1,4 @@ -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from django.conf import settings from django.urls import reverse diff --git a/wpadmin/templates/admin/pagination.html b/wpadmin/templates/admin/pagination.html index a77dabb..dbbb1a4 100644 --- a/wpadmin/templates/admin/pagination.html +++ b/wpadmin/templates/admin/pagination.html @@ -6,6 +6,6 @@ {% 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 %} +{{ cl.result_count }} {% if cl.result_count == 1 %}{{ cl.opts.verbose_name }}{% else %}{{ cl.opts.verbose_name_plural }}{% endif %} {% if show_all_url %}  {% trans 'Show all' %}{% endif %}

diff --git a/wpadmin/templatetags/wpadmin_tags.py b/wpadmin/templatetags/wpadmin_tags.py index eb19a1f..1b59490 100644 --- a/wpadmin/templatetags/wpadmin_tags.py +++ b/wpadmin/templatetags/wpadmin_tags.py @@ -1,6 +1,6 @@ from django import template from django.utils.safestring import mark_safe -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from wpadmin.utils import ( get_admin_site_name, get_wpadmin_settings, are_breadcrumbs_enabled)