diff -r 6641e941ef1e -r ff1a9aa48cfd app/django/contrib/localflavor/ar/forms.py --- a/app/django/contrib/localflavor/ar/forms.py Tue Oct 14 12:36:55 2008 +0000 +++ b/app/django/contrib/localflavor/ar/forms.py Tue Oct 14 16:00:59 2008 +0000 @@ -3,10 +3,10 @@ AR-specific Form helpers. """ -from django.newforms import ValidationError -from django.newforms.fields import RegexField, CharField, Select, EMPTY_VALUES +from django.forms import ValidationError +from django.forms.fields import RegexField, CharField, Select, EMPTY_VALUES from django.utils.encoding import smart_unicode -from django.utils.translation import ugettext +from django.utils.translation import ugettext_lazy as _ class ARProvinceSelect(Select): """ @@ -24,7 +24,7 @@ See http://www.correoargentino.com.ar/consulta_cpa/home.php """ default_error_messages = { - 'invalid': ugettext("Enter a postal code in the format NNNN or ANNNNAAA."), + 'invalid': _("Enter a postal code in the format NNNN or ANNNNAAA."), } def __init__(self, *args, **kwargs): @@ -46,8 +46,8 @@ A field that validates 'Documento Nacional de Identidad' (DNI) numbers. """ default_error_messages = { - 'invalid': ugettext("This field requires only numbers."), - 'max_digits': ugettext("This field requires 7 or 8 digits."), + 'invalid': _("This field requires only numbers."), + 'max_digits': _("This field requires 7 or 8 digits."), } def __init__(self, *args, **kwargs): @@ -76,8 +76,8 @@ CUIT is of the form XX-XXXXXXXX-V. The last digit is a check digit. """ default_error_messages = { - 'invalid': ugettext('Enter a valid CUIT in XX-XXXXXXXX-X or XXXXXXXXXXXX format.'), - 'checksum': ugettext("Invalid CUIT."), + 'invalid': _('Enter a valid CUIT in XX-XXXXXXXX-X or XXXXXXXXXXXX format.'), + 'checksum': _("Invalid CUIT."), } def __init__(self, *args, **kwargs):