Ticket #3600: newforms_translation_fix.patch

fields.py

@@ -49 +49 @@
         #            *not* used as a fallback if data isn't given.
         # help_text -- An optional string to use as "help text" for this Field.
         if label is not None:
-            label = smart_unicode(label)
+            label = label
         self.required, self.label, self.initial = required, label, initial
-        self.help_text = smart_unicode(help_text or '')
+        self.help_text = help_text or ''
         widget = widget or self.widget
         if isinstance(widget, type):
             widget = widget()

forms.py

@@ -8 +8 @@
 from widgets import TextInput, Textarea, HiddenInput, MultipleHiddenInput
 from util import flatatt, StrAndUnicode, ErrorDict, ErrorList, ValidationError
 import copy
+from util import smart_unicode
 
 __all__ = ('BaseForm', 'Form')
 
@@ -123 +124 @@
                     output.append(error_row % bf_errors)
                 label = bf.label and bf.label_tag(escape(bf.label + ':')) or ''
                 if field.help_text:
-                    help_text = help_text_html % field.help_text
+                    help_text = help_text_html % smart_unicode(field.help_text)
                 else:
                     help_text = u''
-                output.append(normal_row % {'errors': bf_errors, 'label': label, 'field': unicode(bf), 'help_text': help_text})
+                output.append(normal_row % {'errors': bf_errors, 'label': smart_unicode(label), 'field': unicode(bf), 'help_text': help_text})
         if top_errors:
             output.insert(0, error_row % top_errors)
         if hidden_fields: # Insert any hidden fields in the last row.