diff options
| author | Jannis Leidel <jannis@leidel.info> | 2010-01-01 21:33:30 +0000 |
|---|---|---|
| committer | Jannis Leidel <jannis@leidel.info> | 2010-01-01 21:33:30 +0000 |
| commit | 4b2e6743290de5170b2ac96b46241046947f4510 (patch) | |
| tree | 317a100526c6df906633feebd479df0444f5e45b | |
| parent | 6eb205c91447ce8237f0919e156b7d26f6ffc1cd (diff) | |
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
| -rw-r--r-- | django/contrib/localflavor/uk/forms.py | 2 | ||||
| -rw-r--r-- | tests/regressiontests/forms/localflavor/uk.py | 11 |
2 files changed, 12 insertions, 1 deletions
diff --git a/django/contrib/localflavor/uk/forms.py b/django/contrib/localflavor/uk/forms.py index 7df736444a..aafe9734db 100644 --- a/django/contrib/localflavor/uk/forms.py +++ b/django/contrib/localflavor/uk/forms.py @@ -33,7 +33,7 @@ class UKPostcodeField(CharField): # Put a single space before the incode (second part). postcode = self.space_regex.sub(r' \1', postcode) if not self.postcode_regex.search(postcode): - raise ValidationError(self.default_error_messages['invalid']) + raise ValidationError(self.error_messages['invalid']) return postcode class UKCountySelect(Select): diff --git a/tests/regressiontests/forms/localflavor/uk.py b/tests/regressiontests/forms/localflavor/uk.py index 258c22e5a9..cd6c8edf84 100644 --- a/tests/regressiontests/forms/localflavor/uk.py +++ b/tests/regressiontests/forms/localflavor/uk.py @@ -58,4 +58,15 @@ u'BT32 4PX' u'' >>> f.clean('') 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!'] """ |