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/fr/forms.py

    r5876 r6926  
    1212 
    1313class FRZipCodeField(RegexField): 
     14    default_error_messages = { 
     15        'invalid': ugettext('Enter a zip code in the format XXXXX.'), 
     16    } 
     17 
    1418    def __init__(self, *args, **kwargs): 
    1519        super(FRZipCodeField, self).__init__(r'^\d{5}$', 
    16             max_length=None, min_length=None, 
    17             error_message=ugettext('Enter a zip code in the format XXXXX.'), 
    18                     *args, **kwargs) 
     20            max_length=None, min_length=None, *args, **kwargs) 
    1921 
    2022class FRPhoneNumberField(Field): 
     
    2527    '0X XX XX XX XX'. 
    2628    """ 
     29    default_error_messages = { 
     30        'invalid': u'Phone numbers must be in 0X XX XX XX XX format.', 
     31    } 
     32 
    2733    def clean(self, value): 
    2834        super(FRPhoneNumberField, self).clean(value) 
     
    3339        if m: 
    3440            return u'%s %s %s %s %s' % (value[0:2], value[2:4], value[4:6], value[6:8], value[8:10]) 
    35         raise ValidationError(u'Phone numbers must be in 0X XX XX XX XX format.'
     41        raise ValidationError(self.error_messages['invalid']
    3642 
    3743class FRDepartmentSelect(Select):