Ticket #9079: label_tag_r9027.diff

django/forms/fields.py

@@ -59 +59 @@
     creation_counter = 0
 
     def __init__(self, required=True, widget=None, label=None, initial=None,
-                 help_text=None, error_messages=None, show_hidden_initial=False):
+                 help_text=None, error_messages=None, show_hidden_initial=False, label_tag_attrs=None):
         # required -- Boolean that specifies whether the field is required.
         #             True by default.
         # widget -- A Widget class, or instance of a Widget class, that should
@@ -108 +108 @@
         messages.update(error_messages or {})
         self.error_messages = messages
 
+        self.label_tag_attrs = {}
+        self.label_tag_attrs.update(label_tag_attrs or {})
+
     def clean(self, value):
         """
         Validates the given value and returns its "cleaned" value as an

django/forms/forms.py

@@ -389 +389 @@
         If attrs are given, they're used as HTML attributes on the <label> tag.
         """
         contents = contents or escape(self.label)
+        tag_attrs = {}
+        tag_attrs.update(self.field.label_tag_attrs)
+        tag_attrs.update(attrs or {})
         widget = self.field.widget
         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))
+            tag_attrs = tag_attrs and flatatt(tag_attrs) or ''
+            contents = u'<label for="%s"%s>%s</label>' % (widget.id_for_label(id_), tag_attrs, unicode(contents))
         return mark_safe(contents)
 
     def _is_hidden(self):