Ticket #10321: mocksoul_form_label_tag_templates.patch

django/forms/forms.py

@@ -70 +70 @@
     # class, not to the Form class.
     def __init__(self, data=None, files=None, auto_id='id_%s', prefix=None,
                  initial=None, error_class=ErrorList, label_suffix=':',
+                 label_template='<label for="%(id)s"%(attrs)s>%(contents)s</label>',
                  empty_permitted=False):
         self.is_bound = data is not None or files is not None
         self.data = data or {}
@@ -79 +80 @@
         self.initial = initial or {}
         self.error_class = error_class
         self.label_suffix = label_suffix
+        self.label_template = label_template
         self.empty_permitted = empty_permitted
         self._errors = None # Stores the errors after clean() has been called.
         self._changed_data = None
@@ -374 +376 @@
         id_ = widget.attrs.get('id') or self.auto_id
         if id_:
             attrs = attrs and flatatt(attrs) or ''
-            contents = u'<label for="%s"%s>%s</label>' % (widget.id_for_label(id_), attrs, unicode(contents))
+            contents = self.form.label_template % {
+                'id': widget.id_for_label(id_),
+                'attrs': attrs,
+                'contents': unicode(contents)
+            }
         return mark_safe(contents)
 
     def _is_hidden(self):

django/forms/models.py

@@ -186 +186 @@
 class BaseModelForm(BaseForm):
     def __init__(self, data=None, files=None, auto_id='id_%s', prefix=None,
                  initial=None, error_class=ErrorList, label_suffix=':',
+                 label_template='<label for="%(id)s"%(attrs)s>%(contents)s</label>',
                  empty_permitted=False, instance=None):
         opts = self._meta
         if instance is None:
@@ -199 +200 @@
         if initial is not None:
             object_data.update(initial)
         super(BaseModelForm, self).__init__(data, files, auto_id, prefix, object_data,
-                                            error_class, label_suffix, empty_permitted)
+                                            error_class, label_suffix, label_template, empty_permitted)
     def clean(self):
         self.validate_unique()