Ticket #5373: 0001-Regression-for-5373-with-tests.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:

new file tests/regressiontests/forms/forms.py

@@ +1 @@
+from django.forms import FileField, Form, ModelForm
+
+from .models import Cheese, ChoiceFieldModel
+
+
+class CheeseForm(ModelForm):
+    class Meta:
+        model = Cheese
+
+
+class ChoiceFieldForm(ModelForm):
+    class Meta:
+        model = ChoiceFieldModel
+
+
+class FileForm(Form):
+    file1 = FileField()

tests/regressiontests/forms/models.py

@@ -41 +41 @@
 
     class Meta:
         ordering = ('name',)
+        verbose_name = ('Choice Option')  #  regression t5373
 
     def __unicode__(self):
         return u'ChoiceOption %d' % self.pk

tests/regressiontests/forms/tests/models.py

@@ -5 +5 @@
 
 from django.core.files.uploadedfile import SimpleUploadedFile
 from django.db import models
-from django.forms import Form, ModelForm, FileField, ModelChoiceField
+from django.forms import ModelForm, ModelChoiceField
 from django.forms.models import ModelFormMetaclass
 from django.test import TestCase
 
-from ..models import (ChoiceOptionModel, ChoiceFieldModel, FileModel, Group,
+from ..forms import ChoiceFieldForm, FileForm
+from ..models import (ChoiceOptionModel, FileModel, Group,
     BoundaryModel, Defaults)
 
 
-class ChoiceFieldForm(ModelForm):
-    class Meta:
-        model = ChoiceFieldModel
-
-
-class FileForm(Form):
-    file1 = FileField()
-
-
 class TestTicket12510(TestCase):
     ''' It is not necessary to generate choices for ModelChoiceField (regression test for #12510). '''
     def setUp(self):
@@ -33 +25 @@
             field = ModelChoiceField(Group.objects.order_by('-name'))
             self.assertEqual('a', field.clean(self.groups[0].pk).name)
 
+
 class ModelFormCallableModelDefault(TestCase):
     def test_no_empty_option(self):
         "If a model's ForeignKey has blank=False and a default, no empty option is created (Refs #10792)."
@@ -102 +95 @@
 <input type="hidden" name="initial-multi_choice_int" value="3" id="initial-id_multi_choice_int_1" /> <span class="helptext"> Hold down "Control", or "Command" on a Mac, to select more than one.</span></p>""")
 
 
-
 class FormsModelTestCase(TestCase):
     def test_unicode_filename(self):
         # FileModel with unicode filename and data #########################
@@ -166 +158 @@
         self.assertEqual(obj.value, 99)
         self.assertEqual(obj.def_date, datetime.date(1999, 3, 2))
 
+
 class RelatedModelFormTests(TestCase):
     def test_invalid_loading_order(self):
         """

tests/regressiontests/forms/tests/regressions.py

@@ -4 +4 @@
 from django.test import TestCase
 from django.utils.translation import ugettext_lazy, override
 
-from regressiontests.forms.models import Cheese
+from ..forms import CheeseForm, ChoiceFieldForm
+from ..models import ChoiceOptionModel
 
 
 class FormsRegressionsTestCase(TestCase):
@@ -129 +130 @@
         a pk uniqueness error.
 
         """
-        class CheeseForm(ModelForm):
-            class Meta:
-                model = Cheese
-
-        form = CheeseForm({
-            'name': 'Brie',
-        })
-
+        form = CheeseForm({'name': 'Brie'})
         self.assertTrue(form.is_valid())
 
         obj = form.save()
         obj.name = 'Camembert'
         obj.full_clean()
+
+    def test_regression_5373(self):
+        """Field label for a ForeignKey should be translated"""
+        ChoiceOptionModel.objects.create(id=1, name='default')
+        form = ChoiceFieldForm()
+        self.assertEqual(form.fields['choice'].label,
+            ChoiceOptionModel._meta.verbose_name)