--- a/app/django/contrib/localflavor/it/forms.py Tue Oct 14 12:36:55 2008 +0000
+++ b/app/django/contrib/localflavor/it/forms.py Tue Oct 14 16:00:59 2008 +0000
@@ -2,16 +2,16 @@
IT-specific Form helpers
"""
-from django.newforms import ValidationError
-from django.newforms.fields import Field, RegexField, Select, EMPTY_VALUES
-from django.utils.translation import ugettext
+from django.forms import ValidationError
+from django.forms.fields import Field, RegexField, Select, EMPTY_VALUES
+from django.utils.translation import ugettext_lazy as _
from django.utils.encoding import smart_unicode
from django.contrib.localflavor.it.util import ssn_check_digit, vat_number_check_digit
import re
class ITZipCodeField(RegexField):
default_error_messages = {
- 'invalid': ugettext('Enter a valid zip code.'),
+ 'invalid': _('Enter a valid zip code.'),
}
def __init__(self, *args, **kwargs):
super(ITZipCodeField, self).__init__(r'^\d{5}$',
@@ -27,7 +27,7 @@
class ITProvinceSelect(Select):
"""
- A Select widget that uses a list of IT regions as its choices.
+ A Select widget that uses a list of IT provinces as its choices.
"""
def __init__(self, attrs=None):
from it_province import PROVINCE_CHOICES
@@ -40,7 +40,7 @@
'Informazioni sulla codificazione delle persone fisiche'.
"""
default_error_messages = {
- 'invalid': ugettext(u'Enter a valid Social Security number.'),
+ 'invalid': _(u'Enter a valid Social Security number.'),
}
def __init__(self, *args, **kwargs):
@@ -65,7 +65,7 @@
A form field that validates Italian VAT numbers (partita IVA).
"""
default_error_messages = {
- 'invalid': ugettext(u'Enter a valid VAT number.'),
+ 'invalid': _(u'Enter a valid VAT number.'),
}
def clean(self, value):