Changeset 8761

Timestamp:

08/31/08 06:39:06 (3 months ago)

Author:

mtredinnick

Message:

Fixed #5216 -- Fixed a case of a string not being a unicode string.
Thanks to Vadim Fint for the test case.

Files:

• django/trunk/django/forms/forms.py (modified) (1 diff)
• django/trunk/tests/regressiontests/forms/regressions.py (modified) (1 diff)

django/trunk/django/forms/forms.py

@@ -375 +375 @@
-        if id_:
-            attrs = attrs and flatatt(attrs) or ''
-'<label for="%s"%s>%s</label>' % (widget.id_for_label(id_), attrs, contents
+u'<label for="%s"%s>%s</label>' % (widget.id_for_label(id_), attrs, unicode(contents)
-        return mark_safe(contents)
-

django/trunk/tests/regressiontests/forms/regressions.py

@@ -34 +34 @@
-u'<p><label for="id_username">Nazwa u\u017cytkownika:</label> <input id="id_username" type="text" name="username" maxlength="10" /></p>'
->>> deactivate()
+
+There was some problems with form translations in #5216
+>>> class SomeForm(Form):
+...     field_1 = CharField(max_length=10, label=ugettext_lazy('field_1'))
+...     field_2 = CharField(max_length=10, label=ugettext_lazy('field_2'), widget=TextInput(attrs={'id': 'field_2_id'}))
+>>> f = SomeForm()
+>>> print f['field_1'].label_tag()
+<label for="id_field_1">field_1</label>
+>>> print f['field_2'].label_tag()
+<label for="field_2_id">field_2</label>
-
-Unicode decoding problems...