diff -r b758351d191f -r cc9b7e14412b web/lib/django/contrib/localflavor/us/forms.py --- a/web/lib/django/contrib/localflavor/us/forms.py Wed May 19 17:43:59 2010 +0200 +++ b/web/lib/django/contrib/localflavor/us/forms.py Tue May 25 02:43:45 2010 +0200 @@ -2,8 +2,9 @@ USA-specific Form helpers """ +from django.core.validators import EMPTY_VALUES from django.forms import ValidationError -from django.forms.fields import Field, RegexField, Select, EMPTY_VALUES +from django.forms.fields import Field, RegexField, Select, CharField from django.utils.encoding import smart_unicode from django.utils.translation import ugettext_lazy as _ import re @@ -20,9 +21,9 @@ super(USZipCodeField, self).__init__(r'^\d{5}(?:-\d{4})?$', max_length=None, min_length=None, *args, **kwargs) -class USPhoneNumberField(Field): +class USPhoneNumberField(CharField): default_error_messages = { - 'invalid': u'Phone numbers must be in XXX-XXX-XXXX format.', + 'invalid': _('Phone numbers must be in XXX-XXX-XXXX format.'), } def clean(self, value): @@ -84,7 +85,7 @@ abbreviation for the given state. """ default_error_messages = { - 'invalid': u'Enter a U.S. state or territory.', + 'invalid': _('Enter a U.S. state or territory.'), } def clean(self, value):