test0908
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[1.6.x] Moved translator comment just above the target string 

Backport of 8cd874298 from master.
This commit is contained in:
Claude Paroz 2013-08-22 09:14:06 +02:00
parent 161e26c2ec
commit ff92a6eb5b
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
django/conf/locale/en/LC_MESSAGES/django.po
View File

@ -4,7 +4,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: Django\n" "Project-Id-Version: Django\n"
"Report-Msgid-Bugs-To: \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" "PO-Revision-Date: 2010-05-13 15:35+0200\n"
"Last-Translator: Django team\n" "Last-Translator: Django team\n"
"Language-Team: English <en@li.org>\n" "Language-Team: English <en@li.org>\n"
@ -717,6 +717,8 @@ msgstr ""
msgid "(Hidden field %(name)s) %(error)s" msgid "(Hidden field %(name)s) %(error)s"
msgstr "" 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 #: forms/forms.py:527
msgid ":?.!" msgid ":?.!"
msgstr "" msgstr ""

2
django/forms/forms.py
View File

@ -521,9 +521,9 @@ class BoundField(object):
""" """
contents = contents or self.label contents = contents or self.label
# Only add the suffix if the label does not end in punctuation. # 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 # Translators: If found as last label character, these punctuation
# characters will prevent the default label_suffix to be appended to the label # 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 _(':?.!'): if label_suffix and contents and contents[-1] not in _(':?.!'):
contents = format_html('{0}{1}', contents, label_suffix) contents = format_html('{0}{1}', contents, label_suffix)
widget = self.field.widget widget = self.field.widget