Ticket #23345: patch.txt

File patch.txt, 1.1 KB (added by codefisher, 10 years ago)
Line 
1diff --git a/django/forms/fields.py b/django/forms/fields.py
2index 577e6b4..1181542 100644
3--- a/django/forms/fields.py
4+++ b/django/forms/fields.py
5@@ -58,7 +58,7 @@ class Field(six.with_metaclass(RenameFieldMethods, object)):
6 # Add an 'invalid' entry to default_error_message if you want a specific
7 # field error message not raised by the field validators.
8 default_error_messages = {
9- 'required': _('This field is required.'),
10+ 'required': _('%(label)s is required.'),
11 }
12 empty_values = list(validators.EMPTY_VALUES)
13
14@@ -133,7 +133,9 @@ class Field(six.with_metaclass(RenameFieldMethods, object)):
15
16 def validate(self, value):
17 if value in self.empty_values and self.required:
18- raise ValidationError(self.error_messages['required'], code='required')
19+ if not self.label:
20+ raise ValidationError(self.error_messages['required'] % {"label": _('This field')}, code='required')
21+ raise ValidationError(self.error_messages['required'] % {"label": self.label}, code='required')
22
23 def run_validators(self, value):
24 if value in self.empty_values:
Back to Top