diff -r 6641e941ef1e -r ff1a9aa48cfd app/django/contrib/localflavor/uk/forms.py --- a/app/django/contrib/localflavor/uk/forms.py Tue Oct 14 12:36:55 2008 +0000 +++ b/app/django/contrib/localflavor/uk/forms.py Tue Oct 14 16:00:59 2008 +0000 @@ -4,9 +4,9 @@ import re -from django.newforms.fields import CharField, Select -from django.newforms import ValidationError -from django.utils.translation import ugettext +from django.forms.fields import CharField, Select +from django.forms import ValidationError +from django.utils.translation import ugettext_lazy as _ class UKPostcodeField(CharField): """ @@ -18,7 +18,7 @@ The value is uppercased and a space added in the correct place, if required. """ default_error_messages = { - 'invalid': ugettext(u'Enter a valid postcode.'), + 'invalid': _(u'Enter a valid postcode.'), } outcode_pattern = '[A-PR-UWYZ]([0-9]{1,2}|([A-HIK-Y][0-9](|[0-9]|[ABEHMNPRVWXY]))|[0-9][A-HJKSTUW])' incode_pattern = '[0-9][ABD-HJLNP-UW-Z]{2}'