diff options
| author | Claude Paroz <claude@2xlibre.net> | 2013-08-22 09:14:06 +0200 |
|---|---|---|
| committer | Claude Paroz <claude@2xlibre.net> | 2013-08-22 09:54:35 +0200 |
| commit | ff92a6eb5b87c65ca47568e0ca37df949e17feb2 (patch) | |
| tree | 75941da2d34c35c8f6dd875ec11e445d8fd25636 | |
| parent | 161e26c2ec9f88bf0395941aaa2fd193b110affd (diff) | |
[1.6.x] Moved translator comment just above the target string
Backport of 8cd874298 from master.
| -rw-r--r-- | django/conf/locale/en/LC_MESSAGES/django.po | 4 | ||||
| -rw-r--r-- | django/forms/forms.py | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/django/conf/locale/en/LC_MESSAGES/django.po b/django/conf/locale/en/LC_MESSAGES/django.po index a707cb9ba5..de23c8dcf2 100644 --- a/django/conf/locale/en/LC_MESSAGES/django.po +++ b/django/conf/locale/en/LC_MESSAGES/django.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-08-16 15:07+0200\n" +"POT-Creation-Date: 2013-08-22 09:54+0200\n" "PO-Revision-Date: 2010-05-13 15:35+0200\n" "Last-Translator: Django team\n" "Language-Team: English <en@li.org>\n" @@ -717,6 +717,8 @@ msgstr "" msgid "(Hidden field %(name)s) %(error)s" msgstr "" +#. Translators: If found as last label character, these punctuation +#. characters will prevent the default label_suffix to be appended to the label #: forms/forms.py:527 msgid ":?.!" msgstr "" diff --git a/django/forms/forms.py b/django/forms/forms.py index 10ae1248da..0dfcdebbf0 100644 --- a/django/forms/forms.py +++ b/django/forms/forms.py @@ -521,9 +521,9 @@ class BoundField(object): """ contents = contents or self.label # Only add the suffix if the label does not end in punctuation. + label_suffix = label_suffix if label_suffix is not None else self.form.label_suffix # Translators: If found as last label character, these punctuation # characters will prevent the default label_suffix to be appended to the label - 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 |