Ticket #11369: 11369-r11267.diff

django/db/models/options.py

@@ -18 +18 @@
 # Calculate the verbose_name by converting from InitialCaps to "lowercase with spaces".
 get_verbose_name = lambda class_name: re.sub('(((?<=[a-z])[A-Z])|([A-Z](?![A-Z]|$)))', ' \\1', class_name).lower().strip()
 
-DEFAULT_NAMES = ('verbose_name', 'db_table', 'ordering',
+DEFAULT_NAMES = ('verbose_name', 'verbose_name_plural', 'db_table', 'ordering',
                  'unique_together', 'permissions', 'get_latest_by',
                  'order_with_respect_to', 'app_label', 'db_tablespace',
                  'abstract', 'managed', 'proxy')
@@ -89 +89 @@
 
             # verbose_name_plural is a special case because it uses a 's'
             # by default.
-            setattr(self, 'verbose_name_plural', meta_attrs.pop('verbose_name_plural', string_concat(self.verbose_name, 's')))
+            if getattr(self, 'verbose_name_plural', None) is None:
+                setattr(self, 'verbose_name_plural', string_concat(self.verbose_name, 's'))
 
             # Any leftover attributes must be invalid.
             if meta_attrs != {}:

tests/regressiontests/model_inheritance_regress/models.py

@@ -109 +109 @@
     def __unicode__(self):
         return "PK = %d, base_name = %s, derived_name = %s" \
                 % (self.customPK, self.base_name, self.derived_name)
+
+class AuditBase(models.Model):
+    planned_date = models.DateTimeField()
+
+    class Meta:
+        abstract = True
+        verbose_name_plural = u'Audits'
+
+class CertificationAudit(AuditBase):
+
+    class Meta(AuditBase.Meta):
+        abstract = True
+
+class InternalCertificationAudit(CertificationAudit):
+    auditing_dept = models.CharField(max_length=20)
 
 __test__ = {'API_TESTS':"""
 # Regression for #7350, #7202
@@ -318 +333 @@
 >>> ParkingLot3._meta.get_ancestor_link(Place).name  # the child->parent link
 "parent"
 
+# Regression for #11369: verbose_name_plural should be inherited from an ABC
+# even when there is one or more additional intermediate abstract models in the
+# inheritance chain.
+>>> InternalCertificationAudit._meta.verbose_name_plural
+u"Audits"
+
 """}