Permalink
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
  • Loading branch information...
1 parent a63a83e commit 24bacb19dea298943f54155f911df380c73f9ea2 @malcolmt malcolmt committed Aug 31, 2008
Showing with 11 additions and 1 deletion.
  1. +1 −1 django/forms/forms.py
  2. +10 −0 tests/regressiontests/forms/regressions.py
View
@@ -374,7 +374,7 @@ def label_tag(self, contents=None, attrs=None):
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):
@@ -34,6 +34,16 @@
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):

0 comments on commit 24bacb1

Please sign in to comment.