Ticket #17190: 17190.diff

django/forms/widgets.py

@@ -552 +552 @@
     A Select Widget intended to be used with NullBooleanField.
     """
     def __init__(self, attrs=None):
-        choices = ((u'1', ugettext('Unknown')), (u'2', ugettext('Yes')), (u'3', ugettext('No')))
+        choices = ((u'1', ugettext_lazy('Unknown')),
+                   (u'2', ugettext_lazy('Yes')),
+                   (u'3', ugettext_lazy('No')))
         super(NullBooleanSelect, self).__init__(attrs, choices)
 
     def render(self, name, value, attrs=None, choices=()):

tests/regressiontests/forms/tests/widgets.py

@@ -984 +984 @@
         self.assertEqual(w.render('date', datetime.datetime(2007, 9, 17, 12, 51)), u'<input type="hidden" name="date_0" value="2007-09-17" /><input type="hidden" name="date_1" value="12:51:00" />')
 
 
+class NullSelectNotLazyForm(Form):
+    """Form to test for lazy evaluation #17190"""
+    name = CharField(widget=NullBooleanSelect())
+
+
 class FormsI18NWidgetsTestCase(TestCase):
     def setUp(self):
         super(FormsI18NWidgetsTestCase, self).setUp()
@@ -1025 +1030 @@
         w.is_localized = True
         self.assertEqual(w.render('date', datetime.datetime(2007, 9, 17, 12, 51)), u'<input type="hidden" name="date_0" value="17.09.2007" /><input type="hidden" name="date_1" value="12:51:00" />')
 
+    def test_nullbooleanselect(self):
+        """test for lazy evaluation #17190"""
+        f = NullSelectNotLazyForm()
+        self.assertEqual(f.as_table(), u'<tr><th><label for="id_name">Name:</label></th><td><select name="name" id="id_name">\n<option value="1" selected="selected">Unbekannt</option>\n<option value="2">Ja</option>\n<option value="3">Nein</option>\n</select></td></tr>')
+
 
 class SelectAndTextWidget(MultiWidget):
     """