Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

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

Backport of 8cd8742 from master.
  • Loading branch information...
commit ff92a6eb5b87c65ca47568e0ca37df949e17feb2 1 parent 161e26c
Claude Paroz authored
4  django/conf/locale/en/LC_MESSAGES/django.po
@@ -4,7 +4,7 @@ msgid ""
4 4
 msgstr ""
5 5
 "Project-Id-Version: Django\n"
6 6
 "Report-Msgid-Bugs-To: \n"
7  
-"POT-Creation-Date: 2013-08-16 15:07+0200\n"
  7
+"POT-Creation-Date: 2013-08-22 09:54+0200\n"
8 8
 "PO-Revision-Date: 2010-05-13 15:35+0200\n"
9 9
 "Last-Translator: Django team\n"
10 10
 "Language-Team: English <en@li.org>\n"
@@ -717,6 +717,8 @@ msgstr ""
717 717
 msgid "(Hidden field %(name)s) %(error)s"
718 718
 msgstr ""
719 719
 
  720
+#. Translators: If found as last label character, these punctuation
  721
+#. characters will prevent the default label_suffix to be appended to the label
720 722
 #: forms/forms.py:527
721 723
 msgid ":?.!"
722 724
 msgstr ""
2  django/forms/forms.py
@@ -521,9 +521,9 @@ def label_tag(self, contents=None, attrs=None, label_suffix=None):
521 521
         """
522 522
         contents = contents or self.label
523 523
         # Only add the suffix if the label does not end in punctuation.
  524
+        label_suffix = label_suffix if label_suffix is not None else self.form.label_suffix
524 525
         # Translators: If found as last label character, these punctuation
525 526
         # characters will prevent the default label_suffix to be appended to the label
526  
-        label_suffix = label_suffix if label_suffix is not None else self.form.label_suffix
527 527
         if label_suffix and contents and contents[-1] not in _(':?.!'):
528 528
             contents = format_html('{0}{1}', contents, label_suffix)
529 529
         widget = self.field.widget

0 notes on commit ff92a6e

Please sign in to comment.
Something went wrong with that request. Please try again.