p31829507
/
django
mirror of https://github.com/django/django.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixed #12017 - Overriding the default error message of the UKPostcodeField works again. 

git-svn-id: http://code.djangoproject.com/svn/django/trunk@12044 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Jannis Leidel 2010-01-01 21:33:30 +00:00
parent 6eb205c914
commit 4b2e674329
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
django/contrib/localflavor/uk/forms.py
View File

@ -33,7 +33,7 @@ class UKPostcodeField(CharField):
# Put a single space before the incode (second part). # Put a single space before the incode (second part).
postcode = self.space_regex.sub(r' \1', postcode) postcode = self.space_regex.sub(r' \1', postcode)
if not self.postcode_regex.search(postcode): if not self.postcode_regex.search(postcode):
raise ValidationError(self.default_error_messages['invalid']) raise ValidationError(self.error_messages['invalid'])
return postcode return postcode
class UKCountySelect(Select): class UKCountySelect(Select):

11
tests/regressiontests/forms/localflavor/uk.py
View File

@ -58,4 +58,15 @@ u'BT32 4PX'
u'' u''
>>> f.clean('') >>> f.clean('')
u'' u''
>>> class MyUKPostcodeField(UKPostcodeField):
... default_error_messages = {
... 'invalid': 'Enter a bloody postcode!',
... }
...
>>>
>>> f = MyUKPostcodeField(required=False)
>>> f.clean('1NV 4L1D')
Traceback (most recent call last):
...
ValidationError: [u'Enter a bloody postcode!']
""" """