diff -r 6641e941ef1e -r ff1a9aa48cfd app/django/contrib/localflavor/fr/forms.py --- a/app/django/contrib/localflavor/fr/forms.py Tue Oct 14 12:36:55 2008 +0000 +++ b/app/django/contrib/localflavor/fr/forms.py Tue Oct 14 16:00:59 2008 +0000 @@ -2,17 +2,17 @@ FR-specific Form helpers """ -from django.newforms import ValidationError -from django.newforms.fields import Field, RegexField, Select, EMPTY_VALUES +from django.forms import ValidationError +from django.forms.fields import Field, RegexField, Select, EMPTY_VALUES from django.utils.encoding import smart_unicode -from django.utils.translation import ugettext +from django.utils.translation import ugettext_lazy as _ import re phone_digits_re = re.compile(r'^0\d(\s|\.)?(\d{2}(\s|\.)?){3}\d{2}$') class FRZipCodeField(RegexField): default_error_messages = { - 'invalid': ugettext('Enter a zip code in the format XXXXX.'), + 'invalid': _('Enter a zip code in the format XXXXX.'), } def __init__(self, *args, **kwargs):