summaryrefslogtreecommitdiff
path: root/django/forms/fields.py
diff options
context:
space:
mode:
Diffstat (limited to 'django/forms/fields.py')
-rw-r--r--django/forms/fields.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/django/forms/fields.py b/django/forms/fields.py
index 882887f3e0..ee0b387b95 100644
--- a/django/forms/fields.py
+++ b/django/forms/fields.py
@@ -131,7 +131,10 @@ class Field(object):
try:
v(value)
except ValidationError, e:
- errors.extend(e.messages)
+ if hasattr(e, 'code'):
+ errors.append(self.error_messages.get(e.code, e.messages[0]))
+ else:
+ errors.extend(e.messages)
if errors:
raise ValidationError(errors)