Fixed #7554 -- Modified contrib.localflavor to make use of ugettext, rather... (e146e508) · Commits · Dom Sekotill / django

django/contrib/localflavor/ar/forms.py

+6 −6

Original line number	Diff line number	Diff line
		@@ -6,7 +6,7 @@ AR-specific Form helpers.
		from django.newforms import ValidationError
		from django.newforms.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 @@ class ARPostalCodeField(RegexField):
		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 @@ class ARDNIField(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 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 @@ class ARCUITField(RegexField):
		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):

django/contrib/localflavor/au/forms.py

+2 −2

Original line number	Diff line number	Diff line
		@@ -5,7 +5,7 @@ Australian-specific Form helpers
		from django.newforms import ValidationError
		from django.newforms.fields import Field, RegexField, Select, EMPTY_VALUES
		from django.newforms.util 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'^(\d{10})$')
		@@ -13,7 +13,7 @@ PHONE_DIGITS_RE = re.compile(r'^(\d{10})$')
		class AUPostCodeField(RegexField):
		"""Australian post code field."""
		default_error_messages = {
		'invalid': ugettext('Enter a 4 digit post code.'),
		'invalid': _('Enter a 4 digit post code.'),
		}

		def __init__(self, args, *kwargs):

django/contrib/localflavor/br/forms.py

+1 −1

Original line number	Diff line number	Diff line
		@@ -6,7 +6,7 @@ BR-specific Form helpers
		from django.newforms import ValidationError
		from django.newforms.fields import Field, RegexField, CharField, Select, EMPTY_VALUES
		from django.utils.encoding import smart_unicode
		from django.utils.translation import ugettext as _
		from django.utils.translation import ugettext_lazy as _
		import re

		try:

django/contrib/localflavor/ca/forms.py

+3 −3

Original line number	Diff line number	Diff line
		@@ -5,7 +5,7 @@ Canada-specific Form helpers
		from django.newforms import ValidationError
		from django.newforms.fields import Field, RegexField, Select, EMPTY_VALUES
		from django.newforms.util import smart_unicode
		from django.utils.translation import gettext, ugettext
		from django.utils.translation import ugettext_lazy as _
		import re

		phone_digits_re = re.compile(r'^(?:1-?)?(\d{3})[-\.]?(\d{3})[-\.]?(\d{4})$')
		@@ -14,7 +14,7 @@ sin_re = re.compile(r"^(\d{3})-(\d{3})-(\d{3})$")
		class CAPostalCodeField(RegexField):
		"""Canadian postal code field."""
		default_error_messages = {
		'invalid': gettext(u'Enter a postal code in the format XXX XXX.'),
		'invalid': _(u'Enter a postal code in the format XXX XXX.'),
		}

		def __init__(self, args, *kwargs):
		@@ -85,7 +85,7 @@ class CASocialInsuranceNumberField(Field):
		See: http://en.wikipedia.org/wiki/Social_Insurance_Number
		"""
		default_error_messages = {
		'invalid': ugettext('Enter a valid Canadian Social Insurance number in XXX-XXX-XXX format.'),
		'invalid': _('Enter a valid Canadian Social Insurance number in XXX-XXX-XXX format.'),
		}

		def clean(self, value):

django/contrib/localflavor/ch/forms.py

+3 −3

Original line number	Diff line number	Diff line
		@@ -5,7 +5,7 @@ Swiss-specific Form helpers
		from django.newforms import ValidationError
		from django.newforms.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

		id_re = re.compile(r"^(?P<idnumber>\w{8})(?P<pos9>(\d{1}\|<))(?P<checksum>\d{1})$")
		@@ -13,7 +13,7 @@ phone_digits_re = re.compile(r'^0([1-9]{1})\d{8}$')

		class CHZipCodeField(RegexField):
		default_error_messages = {
		'invalid': ugettext('Enter a zip code in the format XXXX.'),
		'invalid': _('Enter a zip code in the format XXXX.'),
		}

		def __init__(self, args, *kwargs):
		@@ -61,7 +61,7 @@ class CHIdentityCardNumberField(Field):
		Algorithm is documented at http://adi.kousz.ch/artikel/IDCHE.htm
		"""
		default_error_messages = {
		'invalid': ugettext('Enter a valid Swiss identity or passport card number in X1234567<0 or 1234567890 format.'),
		'invalid': _('Enter a valid Swiss identity or passport card number in X1234567<0 or 1234567890 format.'),
		}

		def has_valid_checksum(self, number):