summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorClaude Paroz <claude@2xlibre.net>2013-04-13 18:20:01 +0200
committerClaude Paroz <claude@2xlibre.net>2013-04-13 18:55:50 +0200
commitbe9ae693c46021fd3a70c0ec21dd566960b29ffb (patch)
treebd09e1021b62dcdfc44b96de7230101277400eb9 /tests
parent9ac4dbd7b53d187ca54f28e247d3a120660938ca (diff)
Fixed #17840 -- Generalized named placeholders in form error messages
Also fixed plural messages for DecimalField.
Diffstat (limited to 'tests')
-rw-r--r--tests/forms_tests/tests/test_error_messages.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/forms_tests/tests/test_error_messages.py b/tests/forms_tests/tests/test_error_messages.py
index af047daf64..9d45a46a3d 100644
--- a/tests/forms_tests/tests/test_error_messages.py
+++ b/tests/forms_tests/tests/test_error_messages.py
@@ -60,9 +60,9 @@ class FormsErrorMessagesTestCase(TestCase, AssertFormErrorsMixin):
'invalid': 'INVALID',
'min_value': 'MIN VALUE IS %(limit_value)s',
'max_value': 'MAX VALUE IS %(limit_value)s',
- 'max_digits': 'MAX DIGITS IS %s',
- 'max_decimal_places': 'MAX DP IS %s',
- 'max_whole_digits': 'MAX DIGITS BEFORE DP IS %s',
+ 'max_digits': 'MAX DIGITS IS %(max)s',
+ 'max_decimal_places': 'MAX DP IS %(max)s',
+ 'max_whole_digits': 'MAX DIGITS BEFORE DP IS %(max)s',
}
f = DecimalField(min_value=5, max_value=10, error_messages=e)
self.assertFormErrors(['REQUIRED'], f.clean, '')
@@ -254,7 +254,7 @@ class ModelChoiceFieldErrorMessagesTestCase(TestCase, AssertFormErrorsMixin):
# ModelMultipleChoiceField
e = {
'required': 'REQUIRED',
- 'invalid_choice': '%s IS INVALID CHOICE',
+ 'invalid_choice': '%(value)s IS INVALID CHOICE',
'list': 'NOT A LIST OF VALUES',
}
f = ModelMultipleChoiceField(queryset=ChoiceModel.objects.all(), error_messages=e)