Commit 74dde439 authored by Malcolm Tredinnick's avatar Malcolm Tredinnick
Browse files

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
parent ea45a932

django/forms/fields.py

+4 −1
Original line number Diff line number Diff line
@@ -74,7 +74,10 @@ class Field(object): 
        if label is not None:

            label = smart_unicode(label)

        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

        if isinstance(widget, type):

            widget = widget()