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

    r6556 r6926  
    3636    The algorithm is documented at http://en.wikipedia.org/wiki/PESEL. 
    3737    """ 
     38    default_error_messages = { 
     39        'invalid': _(u'National Identification Number consists of 11 digits.'), 
     40        'checksum': _(u'Wrong checksum for the National Identification Number.'), 
     41    } 
    3842 
    3943    def __init__(self, *args, **kwargs): 
    4044        super(PLNationalIdentificationNumberField, self).__init__(r'^\d{11}$', 
    41             max_length=None, min_length=None, error_message=_(u'National Identification Number consists of 11 digits.'), 
    42             *args, **kwargs) 
     45            max_length=None, min_length=None, *args, **kwargs) 
    4346 
    4447    def clean(self,value): 
    4548        super(PLNationalIdentificationNumberField, self).clean(value) 
    4649        if not self.has_valid_checksum(value): 
    47             raise ValidationError(_(u'Wrong checksum for the National Identification Number.')) 
     50            raise ValidationError(self.error_messages['checksum']) 
    4851        return u'%s' % value 
    4952 
    …… 
    6669    http://wipos.p.lodz.pl/zylla/ut/nip-rego.html 
    6770    """ 
     71    default_error_messages = { 
     72        'invalid': _(u'Enter a tax number field (NIP) in the format XXX-XXX-XX-XX or XX-XX-XXX-XXX.'), 
     73        'checksum': _(u'Wrong checksum for the Tax Number (NIP).'), 
     74    } 
    6875 
    6976    def __init__(self, *args, **kwargs): 
    7077        super(PLTaxNumberField, self).__init__(r'^\d{3}-\d{3}-\d{2}-\d{2}$|^\d{2}-\d{2}-\d{3}-\d{3}$', 
    71             max_length=None, min_length=None, 
    72             error_message=_(u'Enter a tax number field (NIP) in the format XXX-XXX-XX-XX or XX-XX-XXX-XXX.'),  *args, **kwargs) 
     78            max_length=None, min_length=None, *args, **kwargs) 
    7379 
    7480    def clean(self,value): 
    …… 
    7682        value = re.sub("[-]", "", value) 
    7783        if not self.has_valid_checksum(value): 
    78             raise ValidationError(_(u'Wrong checksum for the Tax Number (NIP).')) 
     84            raise ValidationError(self.error_messages['checksum']) 
    7985        return u'%s' % value 
    8086 
    …… 
    103109    The checksum algorithm is documented at http://wipos.p.lodz.pl/zylla/ut/nip-rego.html 
    104110    """ 
     111    default_error_messages = { 
     112        'invalid': _(u'National Business Register Number (REGON) consists of 7 or 9 digits.'), 
     113        'checksum': _(u'Wrong checksum for the National Business Register Number (REGON).'), 
     114    } 
     115 
    105116    def __init__(self, *args, **kwargs): 
    106117        super(PLNationalBusinessRegisterField, self).__init__(r'^\d{7,9}$', 
    107             max_length=None, min_length=None, error_message=_(u'National Business Register Number (REGON) consists of 7 or 9 digits.'), 
    108             *args, **kwargs) 
     118            max_length=None, min_length=None, *args, **kwargs) 
    109119 
    110120    def clean(self,value): 
    111121        super(PLNationalBusinessRegisterField, self).clean(value) 
    112122        if not self.has_valid_checksum(value): 
    113             raise ValidationError(_(u'Wrong checksum for the National Business Register Number (REGON).')) 
     123            raise ValidationError(self.error_messages['checksum']) 
    114124        return u'%s' % value 
    115125 
    …… 
    143153    Valid code is XX-XXX where X is digit. 
    144154    """ 
     155    default_error_messages = { 
     156        'invalid': _(u'Enter a postal code in the format XX-XXX.'), 
     157    } 
     158 
    145159    def __init__(self, *args, **kwargs): 
    146160        super(PLPostalCodeField, self).__init__(r'^\d{2}-\d{3}$', 
    147             max_length=None, min_length=None, 
    148             error_message=_(u'Enter a postal code in the format XX-XXX.'), 
    149             *args, **kwargs) 
    150  
     161            max_length=None, min_length=None, *args, **kwargs)