From 3b2e28fc85c26dc50d4cc16b7c586f7f0994f752 Mon Sep 17 00:00:00 2001
From: Claude Paroz <claude@2xlibre.net>
Date: Mon, 30 Jan 2017 21:38:55 +0100
Subject: [PATCH] Used model_ngettext in two more places

---
 django/contrib/admin/actions.py |  5 +----
 django/contrib/admin/options.py | 10 +++-------
 2 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/django/contrib/admin/actions.py b/django/contrib/admin/actions.py
index f07f3549cb..5630d1c94c 100644
--- a/django/contrib/admin/actions.py
+++ b/django/contrib/admin/actions.py
@@ -53,10 +53,7 @@ def delete_selected(modeladmin, request, queryset):
         # Return None to display the change list page again.
         return None
 
-    if len(queryset) == 1:
-        objects_name = force_text(opts.verbose_name)
-    else:
-        objects_name = force_text(opts.verbose_name_plural)
+    objects_name = model_ngettext(queryset)
 
     if perms_needed or protected:
         title = _("Cannot delete %(name)s") % {"name": objects_name}
diff --git a/django/contrib/admin/options.py b/django/contrib/admin/options.py
index ec99b67ddf..ff6aa94be4 100644
--- a/django/contrib/admin/options.py
+++ b/django/contrib/admin/options.py
@@ -16,8 +16,8 @@ from django.contrib.admin.exceptions import DisallowedModelAdminToField
 from django.contrib.admin.templatetags.admin_urls import add_preserved_filters
 from django.contrib.admin.utils import (
     NestedObjects, construct_change_message, flatten_fieldsets,
-    get_deleted_objects, lookup_needs_distinct, model_format_dict, quote,
-    unquote,
+    get_deleted_objects, lookup_needs_distinct, model_format_dict,
+    model_ngettext, quote, unquote,
 )
 from django.contrib.auth import get_permission_codename
 from django.core.exceptions import (
@@ -1611,17 +1611,13 @@ class ModelAdmin(BaseModelAdmin):
                         changecount += 1
 
                 if changecount:
-                    if changecount == 1:
-                        name = force_text(opts.verbose_name)
-                    else:
-                        name = force_text(opts.verbose_name_plural)
                     msg = ungettext(
                         "%(count)s %(name)s was changed successfully.",
                         "%(count)s %(name)s were changed successfully.",
                         changecount
                     ) % {
                         'count': changecount,
-                        'name': name,
+                        'name': model_ngettext(opts, changecount),
                         'obj': force_text(obj),
                     }
                     self.message_user(request, msg, messages.SUCCESS)