Changeset 5112

Timestamp:

04/27/07 09:27:07 (2 years ago)

Author:

russellm

Message:

Fixed #3698 -- Modified newforms labels to only add a colon if the label text doesn't end with punctuation. Thanks, SmileyChris?.

Files:

• django/trunk/django/newforms/forms.py (modified) (1 diff)
• django/trunk/tests/regressiontests/forms/tests.py (modified) (1 diff)

django/trunk/django/newforms/forms.py

@@ -123 +123 @@
-                if errors_on_separate_row and bf_errors:
-                    output.append(error_row % bf_errors)
-
+
+
+
+
+
+
+
+
-                if field.help_text:
-                    help_text = help_text_html % field.help_text

django/trunk/tests/regressiontests/forms/tests.py

@@ -2602 +2602 @@
-<li>Password (again): <input type="password" name="password2" /></li>
-
+Labels for as_* methods will only end in a colon if they don't end in other
+punctuation already.
+>>> class Questions(Form):
+...    q1 = CharField(label='The first question')
+...    q2 = CharField(label='What is your name?')
+...    q3 = CharField(label='The answer to life is:')
+...    q4 = CharField(label='Answer this question!')
+...    q5 = CharField(label='The last question. Period.')
+>>> print Questions(auto_id=False).as_p()
+<p>The first question: <input type="text" name="q1" /></p>
+<p>What is your name? <input type="text" name="q2" /></p>
+<p>The answer to life is: <input type="text" name="q3" /></p>
+<p>Answer this question! <input type="text" name="q4" /></p>
+<p>The last question. Period. <input type="text" name="q5" /></p>
+>>> print Questions().as_p()
+<p><label for="id_q1">The first question:</label> <input type="text" name="q1" id="id_q1" /></p>
+<p><label for="id_q2">What is your name?</label> <input type="text" name="q2" id="id_q2" /></p>
+<p><label for="id_q3">The answer to life is:</label> <input type="text" name="q3" id="id_q3" /></p>
+<p><label for="id_q4">Answer this question!</label> <input type="text" name="q4" id="id_q4" /></p>
+<p><label for="id_q5">The last question. Period.</label> <input type="text" name="q5" id="id_q5" /></p>
+
-A label can be a Unicode object or a bytestring with special characters.
->>> class UserRegistration(Form):