Commit ff92a6eb authored by Claude Paroz's avatar Claude Paroz
Browse files

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

Backport of 8cd87429 from master.
parent 161e26c2

django/conf/locale/en/LC_MESSAGES/django.po

+3 −1
Original line number Diff line number Diff line
@@ -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 ""

django/forms/forms.py

+1 −1
Original line number Diff line number Diff line
@@ -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