mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-07-07 11:19:12 +00:00
Code Issues 32 Releases Wiki Activity

[soc2009/model-validation] Make sure that error messages with parameter get handled correctly

Browse Source 
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/model-validation@11438 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Honza Král 2009-08-12 20:11:10 +00:00
parent 106089c18e
commit 2799e92843
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
django/forms/fields.py
View File

@ -127,8 +127,8 @@ class Field(object):
try: try:
v(value) v(value)
except ValidationError, e: except ValidationError, e:
if hasattr(e, 'code'): if hasattr(e, 'code') and e.code in self.error_messages:
message = self.error_messages.get(e.code, e.messages[0]) message = self.error_messages[e.code]
if e.params: if e.params:
message = message % e.params message = message % e.params
errors.append(message) errors.append(message)

7
django/forms/forms.py
View File

@ -264,8 +264,11 @@ class BaseForm(StrAndUnicode):
except ValidationError, e: except ValidationError, e:
failed = True failed = True
error_list = self._errors.setdefault(name, self.error_class()) error_list = self._errors.setdefault(name, self.error_class())
if hasattr(e, 'code'): if hasattr(e, 'code') and e.code in field.error_messages:
error_list.append(field.error_messages.get(e.code, e.messages[0])) message = field.error_messages[e.code]
if e.params:
message = message % e.params
error_list.append(message)
else: else:
error_list.extend(e.messages) error_list.extend(e.messages)
if failed: if failed: