Revise POC based on a52bdea

thibaudcolas · Jun 2, 2023 · b17492d · b17492d
1 parent 866e4d5
commit b17492d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 20 deletions.
diff --git a/django/contrib/auth/models.py b/django/contrib/auth/models.py
@@ -76,18 +76,18 @@ class Meta:
         ordering = ["content_type__app_label", "content_type__model", "codename"]
 
     def __str__(self):
-        names = { "verbose_name_plural": self.content_type.name_plural, "app_verbose_name": self.content_type.app_verbose_name }
+        names = { "content_type": self.content_type }
 
         if "Can add" in self.name:
-            return _("Can add %(verbose_name_plural)s | %(app_verbose_name)s") % names
+            return _("%(content_type)s | Can add") % names
         if "Can change" in self.name:
-            return _("Can change %(verbose_name_plural)s | %(app_verbose_name)s") % names
+            return _("%(content_type)s | Can change") % names
         if "Can delete" in self.name:
-            return _("Can delete %(verbose_name_plural)s | %(app_verbose_name)s") % names
+            return _("%(content_type)s | Can delete") % names
         if "Can view" in self.name:
-            return _("Can view %(verbose_name_plural)s | %(app_verbose_name)s") % names
+            return _("%(content_type)s | Can view") % names
 
-        return "%s | %s | %s" % (self.name, self.content_type.name_plural, self.content_type.app_verbose_name)
+        return "%s | %s | %s" % (self.content_type, self.name)
 
     def natural_key(self):
         return (self.codename,) + self.content_type.natural_key()

diff --git a/django/contrib/contenttypes/models.py b/django/contrib/contenttypes/models.py
@@ -157,13 +157,6 @@ def name(self):
             return self.model
         return str(model._meta.verbose_name)
 
-    @property
-    def name_plural(self):
-        model = self.model_class()
-        if not model:
-            return self.model
-        return str(model._meta.verbose_name_plural)
-
     @property
     def app_labeled_name(self):
         model = self.model_class()
@@ -174,13 +167,6 @@ def app_labeled_name(self):
             model._meta.verbose_name,
         )
 
-    @property
-    def app_verbose_name(self):
-        model = self.model_class()
-        if not model:
-            return ""
-        return apps.get_app_config(model._meta.app_label).verbose_name
-
     def model_class(self):
         """Return the model class for this type of content."""
         try: