Navigation

Changeset 6955 for django/branches/newforms-admin/django/contrib/localflavor/in_

Timestamp:

12/18/07 23:20:55 (1 year ago)

Author:

jkocherhans

Message:

newforms-admin: Merged from trunk up to [6952].

Files:

django/branches/newforms-admin
- Property svnmerge-integrated changed from /django/trunk:1-4345,4350-4357,4359-4365,4371-4372,4374-4377,4380-4386,4388,4390-4391,4400-4402,4404-4408,4410,4412-4419,4426-4427,4430-4432,4434,4441,4443-4444,4446-4447,4450,4452-4453,4455-4458,4476,4503,4546,4564-4569,4580-4586,4617,4630,4641-6390,6392-6863 to /django/trunk:1-4345,4350-4357,4359-4365,4371-4372,4374-4377,4380-4386,4388,4390-4391,4400-4402,4404-4408,4410,4412-4419,4426-4427,4430-4432,4434,4441,4443-4444,4446-4447,4450,4452-4453,4455-4458,4476,4503,4546,4564-4569,4580-4586,4617,4630,4641-6390,6392-6952

r5918	r6955
11	11
12	12	class INZipCodeField(RegexField):
	13	default_error_messages = {
	14	'invalid': gettext(u'Enter a zip code in the format XXXXXXX.'),
	15	}
	16
13	17	def __init__(self, args, *kwargs):
14	18	super(INZipCodeField, self).__init__(r'^\d{6}$',
15		max_length=None, min_length=None,
16		error_message=gettext(u'Enter a zip code in the format XXXXXXX.'),
17		args, *kwargs)
	19	max_length=None, min_length=None, args, *kwargs)
18	20
19	21	class INStateField(Field):
…	…
23	25	registration abbreviation for the given state or union territory
24	26	"""
	27	default_error_messages = {
	28	'invalid': u'Enter a Indian state or territory.',
	29	}
	30
25	31	def clean(self, value):
26	32	from in_states import STATES_NORMALIZED
…	…
37	43	except KeyError:
38	44	pass
39		raise ValidationError(~~u'Enter a Indian state or territory.'~~)
	45	raise ValidationError(self.error_messages['invalid'])
40	46
41	47	class INStateSelect(Select):