Commit 24bacb19 authored by Malcolm Tredinnick's avatar Malcolm Tredinnick
Browse files

Fixed #5216 -- Fixed a case of a string not being a unicode string. 

Thanks to Vadim Fint for the test case.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@8761 bcc190cf-cafb-0310-a4f2-bffc1f526a37
parent a63a83e5

django/forms/forms.py

+1 −1
Original line number Diff line number Diff line
@@ -374,7 +374,7 @@ class BoundField(StrAndUnicode): 
        id_ = widget.attrs.get('id') or self.auto_id

        if id_:

            attrs = attrs and flatatt(attrs) or ''

            contents = '<label for="%s"%s>%s</label>' % (widget.id_for_label(id_), attrs, contents)

            contents = u'<label for="%s"%s>%s</label>' % (widget.id_for_label(id_), attrs, unicode(contents))

        return mark_safe(contents)



    def _is_hidden(self):

tests/regressiontests/forms/regressions.py

+10 −0
Original line number Diff line number Diff line
@@ -34,6 +34,16 @@ early and still send back the right translation. 
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...

>>> GENDERS = ((u'\xc5', u'En tied\xe4'), (u'\xf8', u'Mies'), (u'\xdf', u'Nainen'))

>>> class SomeForm(Form):