diff -r 6641e941ef1e -r ff1a9aa48cfd app/django/contrib/localflavor/ca/forms.py --- a/app/django/contrib/localflavor/ca/forms.py Tue Oct 14 12:36:55 2008 +0000 +++ b/app/django/contrib/localflavor/ca/forms.py Tue Oct 14 16:00:59 2008 +0000 @@ -2,10 +2,10 @@ Canada-specific Form helpers """ -from django.newforms import ValidationError -from django.newforms.fields import Field, RegexField, Select, EMPTY_VALUES -from django.newforms.util import smart_unicode -from django.utils.translation import gettext, ugettext +from django.forms import ValidationError +from django.forms.fields import Field, RegexField, Select, EMPTY_VALUES +from django.forms.util import smart_unicode +from django.utils.translation import ugettext_lazy as _ import re phone_digits_re = re.compile(r'^(?:1-?)?(\d{3})[-\.]?(\d{3})[-\.]?(\d{4})$') @@ -14,7 +14,7 @@ class CAPostalCodeField(RegexField): """Canadian postal code field.""" default_error_messages = { - 'invalid': gettext(u'Enter a postal code in the format XXX XXX.'), + 'invalid': _(u'Enter a postal code in the format XXX XXX.'), } def __init__(self, *args, **kwargs): @@ -85,7 +85,7 @@ See: http://en.wikipedia.org/wiki/Social_Insurance_Number """ default_error_messages = { - 'invalid': ugettext('Enter a valid Canadian Social Insurance number in XXX-XXX-XXX format.'), + 'invalid': _('Enter a valid Canadian Social Insurance number in XXX-XXX-XXX format.'), } def clean(self, value):