Ticket #5373: 5373.4.diff

django/db/models/fields/related.py

@@ -111 +111 @@
 
     def set_attributes_from_rel(self):
         self.name = self.name or (self.rel.to._meta.object_name.lower() + '_' + self.rel.to._meta.pk.name)
-        if self.verbose_name is None:
+        # self.verbose_name is also set in __init__.py 
+        # We need to check the verbose_name if __init__ has merely used the field name
+        # but not if verbose_name is set at declaration of the field
+        # ie foo = ForeignKey(Bar, verbose_name="this is not over-ridden")
+        # but self.verbose_name = bar is overridden if Bar has Meta: verbose_name != ("bar"|"")
+        if self.verbose_name is None or \
+        ((self.verbose_name == self.name.replace('_', ' ')) and \
+        (self.verbose_name != self.rel.to._meta.verbose_name)):
             self.verbose_name = self.rel.to._meta.verbose_name
         self.rel.field_name = self.rel.field_name or self.rel.to._meta.pk.name