Ticket #5373: 5373.3.diff

django/db/models/fields/__init__.py

@@ -9 +9 @@
 
 from django.db import connection
 from django.db.models.fields.subclassing import LegacyConnection
+from django.db.models.fields.related import RelatedField
 from django.db.models.query_utils import QueryWrapper
 from django.conf import settings
 from django import forms
@@ -228 +229 @@
     def set_attributes_from_name(self, name):
         self.name = name
         self.attname, self.column = self.get_attname_column()
-        if self.verbose_name is None and name:
-            self.verbose_name = name.replace('_', ' ')
+        # RelatedField instances will set the verbose_name later if it is  
+        # not set here already. The default value for RelatedField's 
+        # verbose_name will be the verbose_name of the related model.
+        if not isinstance(self, RelatedField): 
+            if self.verbose_name is None and name:
+                self.verbose_name = name.replace('_', ' ')
 
     def contribute_to_class(self, cls, name):
         self.set_attributes_from_name(name)