Ticket #6877: dj-label_suffix-fix.patch

django/forms/forms.py

@@ -150 +150 @@
                     output.append(error_row % force_unicode(bf_errors))
                 if bf.label:
                     label = conditional_escape(force_unicode(bf.label))
-                    # Only add the suffix if the label does not end in
-                    # punctuation.
-                    if self.label_suffix:
-                        if label[-1] not in ':?.!':
-                            label += self.label_suffix
                     label = bf.label_tag(label) or ''
                 else:
                     label = ''
@@ -410 +405 @@
         If attrs are given, they're used as HTML attributes on the <label> tag.
         """
         contents = contents or conditional_escape(self.label)
+        # Only add the suffix if the label does not end in
+        # punctuation.
+        if self.form.label_suffix:
+            if contents[-1] not in ':?.!':
+                contents += self.form.label_suffix
+
         widget = self.field.widget
         id_ = widget.attrs.get('id') or self.auto_id
         if id_: