mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-10-31 09:41:08 +00:00
Code Issues 32 Releases Wiki Activity

Fixed #20805 -- Removed an extra colon beside checkboxes in the admin.

Browse Source 
Thanks CollinAnderson for the report.
This commit is contained in:
Tim Graham
2013-07-26 14:43:46 -04:00
parent 2a979d2a7b
commit 8676318d2d
6 changed files with 40 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
django/forms/forms.py
View File

@@ -509,20 +509,23 @@ class BoundField(object):
)
return self.field.prepare_value(data)
def label_tag(self, contents=None, attrs=None):
def label_tag(self, contents=None, attrs=None, label_suffix=None):
"""
Wraps the given contents in a <label>, if the field has an ID attribute.
contents should be 'mark_safe'd to avoid HTML escaping. If contents
aren't given, uses the field's HTML-escaped label.
If attrs are given, they're used as HTML attributes on the <label> tag.
label_suffix allows overriding the form's label_suffix.
"""
contents = contents or self.label
# Only add the suffix if the label does not end in punctuation.
# Translators: If found as last label character, these punctuation
# characters will prevent the default label_suffix to be appended to the label
if self.form.label_suffix and contents and contents[-1] not in _(':?.!'):
contents = format_html('{0}{1}', contents, self.form.label_suffix)
label_suffix = label_suffix if label_suffix is not None else self.form.label_suffix
if label_suffix and contents and contents[-1] not in _(':?.!'):
contents = format_html('{0}{1}', contents, label_suffix)
widget = self.field.widget
id_ = widget.attrs.get('id') or self.auto_id
if id_: