mirror of https://github.com/django/django.git
The help_text attribute in forms can be a ugettext_lazy() object, so be careful
not to trigger translations at import time. I checked other usages of help_text in form fields and model fields and there is not similar usage in __init__() methods. git-svn-id: http://code.djangoproject.com/svn/django/trunk@8148 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
parent
ea45a932d3
commit
74dde43989
|
@ -74,7 +74,10 @@ class Field(object):
|
||||||
if label is not None:
|
if label is not None:
|
||||||
label = smart_unicode(label)
|
label = smart_unicode(label)
|
||||||
self.required, self.label, self.initial = required, label, initial
|
self.required, self.label, self.initial = required, label, initial
|
||||||
self.help_text = smart_unicode(help_text or '')
|
if help_text is None:
|
||||||
|
self.help_text = u''
|
||||||
|
else:
|
||||||
|
self.help_text = smart_unicode(help_text)
|
||||||
widget = widget or self.widget
|
widget = widget or self.widget
|
||||||
if isinstance(widget, type):
|
if isinstance(widget, type):
|
||||||
widget = widget()
|
widget = widget()
|
||||||
|
|
Loading…
Reference in New Issue