Ticket #5373: 0003-Fix-5373-test-at-model-level.patch

django/db/models/fields/__init__.py

@@ -232 +232 @@
     def unique(self):
         return self._unique or self.primary_key
 
+    def set_verbose_name_from_name(self, name):
+        if self.verbose_name is None and name:
+            self.verbose_name = name.replace('_', ' ')
+
     def set_attributes_from_name(self, name):
         if not self.name:
             self.name = name
         self.attname, self.column = self.get_attname_column()
-        if self.verbose_name is None and self.name:
-            self.verbose_name = self.name.replace('_', ' ')
+        self.set_verbose_name_from_name(name)
 
     def contribute_to_class(self, cls, name):
         self.set_attributes_from_name(name)

django/db/models/fields/related.py

@@ -112 +112 @@
         else:
             self.do_related_class(other, cls)
 
+    def set_verbose_name_from_name(self, name):
+        """
+        for related fields, the verbose name should be set by
+        set_attributes_from_rel
+        """
+        pass
+
     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:

tests/regressiontests/model_regress/models.py

@@ -7 +7 @@
     (2, 'second'),
 )
 
+
 class Article(models.Model):
     headline = models.CharField(max_length=100, default='Default headline')
     pub_date = models.DateTimeField()
@@ -22 +23 @@
     def __unicode__(self):
         return self.headline
 
+
 class Movie(models.Model):
     #5218: Test models with non-default primary keys / AutoFields
     movie_id = models.AutoField(primary_key=True)
     name = models.CharField(max_length=60)
 
+
 class Party(models.Model):
     when = models.DateField(null=True)
 
+
 class Event(models.Model):
     when = models.DateTimeField()
 
+
 class Department(models.Model):
     id = models.PositiveIntegerField(primary_key=True)
     name = models.CharField(max_length=200)
 
+    class Meta:
+        """Used for regression t5373"""
+        verbose_name = ('Fancy Department Name')
+
     def __unicode__(self):
         return self.name
 
+
 class Worker(models.Model):
     department = models.ForeignKey(Department)
+    fake_department = models.ForeignKey(  # for t5373
+        Department, related_name='fake_worker',
+        verbose_name=('Fake Department'),
+        blank=True, null=True,
+    )
     name = models.CharField(max_length=200)
 
     def __unicode__(self):
         return self.name
 
+
 class BrokenUnicodeMethod(models.Model):
     name = models.CharField(max_length=7)
 
@@ -55 +71 @@
         # object).
         return 'Názov: %s' % self.name
 
+
 class NonAutoPK(models.Model):
     name = models.CharField(max_length=10, primary_key=True)

tests/regressiontests/model_regress/tests.py

@@ -164 +164 @@
             1
         )
 
+    def test_regression_5373(self):
+        """Field label for a ForeignKey should be translated"""
+        department = Department.objects.create(id=1)
+        fake_department = Department.objects.create(id=2)
+        worker = Worker.objects.create(
+            department=department,
+            fake_department=fake_department,
+        )
+        self.assertEqual(
+            worker._meta.get_field('department').verbose_name,
+            'Fancy Department Name',
+            msg='patch #5373 fix bad verbose_name for ForeignKeys',
+        )
+        self.assertEqual(
+            worker._meta.get_field('fake_department').verbose_name,
+            'Fake Department',
+            msg='ForeignKey verbose_name overrides Model verbose_name',
+        )
+
 
 class ModelValidationTest(TestCase):
     def test_pk_validation(self):