Django

Code

Show
Ignore:
Timestamp:
12/17/07 02:05:27 (1 year ago)
Author:
mtredinnick
Message:

Fixed #5871 -- Factored out the validation errors in localflavor form fields. Brings them into line with the standard newforms fields. Patch from Jan Rademaker.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • django/trunk/django/contrib/localflavor/fi/forms.py

    r5876 r6926  
    99 
    1010class FIZipCodeField(RegexField): 
     11    default_error_messages = { 
     12        'invalid': ugettext('Enter a zip code in the format XXXXX.'), 
     13    } 
    1114    def __init__(self, *args, **kwargs): 
    1215        super(FIZipCodeField, self).__init__(r'^\d{5}$', 
    13             max_length=None, min_length=None, 
    14             error_message=ugettext('Enter a zip code in the format XXXXX.'), 
    15                     *args, **kwargs) 
     16            max_length=None, min_length=None, *args, **kwargs) 
    1617 
    1718class FIMunicipalitySelect(Select): 
     
    2425 
    2526class FISocialSecurityNumber(Field): 
     27    default_error_messages = { 
     28        'invalid': ugettext('Enter a valid Finnish social security number.'), 
     29    } 
     30 
    2631    def clean(self, value): 
    2732        super(FISocialSecurityNumber, self).clean(value) 
     
    3843            (?P<checksum>[%s])$""" % checkmarks, value, re.VERBOSE | re.IGNORECASE) 
    3944        if not result: 
    40             raise ValidationError(ugettext('Enter a valid Finnish social security number.')
     45            raise ValidationError(self.error_messages['invalid']
    4146        gd = result.groupdict() 
    4247        checksum = int(gd['date'] + gd['serial']) 
    4348        if checkmarks[checksum % len(checkmarks)] == gd['checksum'].upper(): 
    4449            return u'%s' % value.upper() 
    45         raise ValidationError(ugettext('Enter a valid Finnish social security number.')
     50        raise ValidationError(self.error_messages['invalid']