diff -r 6641e941ef1e -r ff1a9aa48cfd app/django/contrib/localflavor/pe/forms.py --- a/app/django/contrib/localflavor/pe/forms.py Tue Oct 14 12:36:55 2008 +0000 +++ b/app/django/contrib/localflavor/pe/forms.py Tue Oct 14 16:00:59 2008 +0000 @@ -3,25 +3,25 @@ PE-specific Form helpers. """ -from django.newforms import ValidationError -from django.newforms.fields import RegexField, CharField, Select, EMPTY_VALUES -from django.utils.translation import ugettext +from django.forms import ValidationError +from django.forms.fields import RegexField, CharField, Select, EMPTY_VALUES +from django.utils.translation import ugettext_lazy as _ -class PEDepartmentSelect(Select): +class PERegionSelect(Select): """ - A Select widget that uses a list of Peruvian Departments as its choices. + A Select widget that uses a list of Peruvian Regions as its choices. """ def __init__(self, attrs=None): - from pe_department import DEPARTMENT_CHOICES - super(PEDepartmentSelect, self).__init__(attrs, choices=DEPARTMENT_CHOICES) + from pe_region import REGION_CHOICES + super(PERegionSelect, self).__init__(attrs, choices=REGION_CHOICES) class PEDNIField(CharField): """ 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 8 digits."), + 'invalid': _("This field requires only numbers."), + 'max_digits': _("This field requires 8 digits."), } def __init__(self, *args, **kwargs): @@ -48,8 +48,8 @@ the form XXXXXXXXXXX. """ default_error_messages = { - 'invalid': ugettext("This field requires only numbers."), - 'max_digits': ugettext("This field requires 11 digits."), + 'invalid': _("This field requires only numbers."), + 'max_digits': _("This field requires 11 digits."), } def __init__(self, *args, **kwargs):