Ticket #14018: changes.diff

django/db/models/fields/related.py

@@ -97 +97 @@
         if not cls._meta.abstract and self.rel.related_name:
             self.rel.related_name = self.rel.related_name % {
                     'class': cls.__name__.lower(),
+                    'class_plural': cls._meta.verbose_name_plural.lower().__str__(),
                     'app_label': cls._meta.app_label.lower(),
                 }
 

docs/topics/db/models.txt

@@ -874 +874 @@
 
 To work around this problem, when you are using :attr:`~django.db.models.ForeignKey.related_name` in an
 abstract base class (only), part of the name should contain
-``'%(app_label)s'`` and ``'%(class)s'``.
+``'%(app_label)s'`` and either ``'%(class)s'`` or ``'%(class_plural)s'``.
 
 - ``'%(class)s'`` is replaced by the lower-cased name of the child class
   that the field is used in.
+- ``'%(class_plural)s'`` is replaced by the lower-case pluralized name (as
+  defined by ``verbose_name_plural`` in the child model's inner ``Meta`` class)
+  of the child class that the field is used in.
 - ``'%(app_label)s'`` is replaced by the lower-cased name of the app the child
   class is contained within. Each installed application name must be unique
   and the model class names within each app must also be unique, therefore the
@@ -908 +911 @@
 ``common_childa_related``, whilst the reverse name of the
 ``common.ChildB.m2m`` field will be ``common_childb_related``, and finally the
 reverse name of the ``rare.ChildB.m2m`` field will be ``rare_childb_related``.
-It is up to you how you use the ``'%(class)s'`` and ``'%(app_label)s`` portion
-to construct your related name, but if you forget to use it, Django will raise
-errors when you validate your models (or run :djadmin:`syncdb`).
+It is up to you how you use the ``'%(class)s'`` (or ``'%(class_plural)s'``) and
+``'%(app_label)s`` portion to construct your related name, but if you forget to
+use it, Django will raise errors when you validate your models (or run
+:djadmin:`syncdb`).
 
 If you don't specify a :attr:`~django.db.models.ForeignKey.related_name`
 attribute for a field in an abstract base class, the default reverse name will