diff --git a/djadmin2/actions.py b/djadmin2/actions.py index 446e9d7..628ccf6 100644 --- a/djadmin2/actions.py +++ b/djadmin2/actions.py @@ -22,9 +22,9 @@ class BaseListAction(AdminModel2Mixin, TemplateView): permission_classes = (permissions.IsStaffPermission,) - empty_message = 'Items must be selected in order to perform actions ' + \ - 'on them. No items have been changed.' - success_message = 'Successfully deleted %d %s' + empty_message = _('Items must be selected in order to perform actions ' + 'on them. No items have been changed.') + success_message = _('Successfully deleted %(count)d %(items)s') queryset = None @@ -98,9 +98,9 @@ class BaseListAction(AdminModel2Mixin, TemplateView): if request.POST.get('confirmed'): if self.process_queryset() is None: - message = _(self.success_message % ( - self.item_count, self.objects_name) - ) + message = _(self.success_message % { + 'count': self.item_count, 'items': self.objects_name + }) messages.add_message(request, messages.INFO, message) return None diff --git a/djadmin2/templates/admin2/bootstrap/actions/delete_selected_confirmation.html b/djadmin2/templates/admin2/bootstrap/actions/delete_selected_confirmation.html index e4d0911..fa5d87f 100644 --- a/djadmin2/templates/admin2/bootstrap/actions/delete_selected_confirmation.html +++ b/djadmin2/templates/admin2/bootstrap/actions/delete_selected_confirmation.html @@ -1,13 +1,13 @@ {% extends "admin2/bootstrap/base.html" %} {% load admin2_tags i18n %} -{% block title %}Are you sure?{% endblock title %} +{% block title %}{% trans "Are you sure?" %}{% endblock title %} -{% block page_title %}Are you sure?{% endblock page_title %} +{% block page_title %}{% trans "Are you sure?" %}{% endblock page_title %} {% block breadcrumbs %}
Please enter your old password, for security's sake, and then enter your new password twice so we can verify you typed it in correctly.
+{% trans "Please enter your old password, for security's sake, and then enter your new password twice so we can verify you typed it in correctly." %}
{% if form.errors %}diff --git a/djadmin2/templates/admin2/bootstrap/base.html b/djadmin2/templates/admin2/bootstrap/base.html index dd2448f..f65acf4 100644 --- a/djadmin2/templates/admin2/bootstrap/base.html +++ b/djadmin2/templates/admin2/bootstrap/base.html @@ -3,7 +3,7 @@
-