Ticket #3698: newforms_labling.patch

django/newforms/forms.py

@@ -121 +121 @@
             else:
                 if errors_on_separate_row and bf_errors:
                     output.append(error_row % bf_errors)
-                label = bf.label and bf.label_tag(escape(bf.label + ':')) or ''
+                if bf.label:
+                    label = escape(bf.label)
+                    if label[-1] not in ':?.!':
+                        # Only add a colon if the label does not end in punctuation.
+                        label += ':'
+                    label = bf.label_tag(label) or ''
+                else:
+                    label = ''
                 if field.help_text:
                     help_text = help_text_html % field.help_text
                 else: