- Timestamp:
- 06/19/08 11:04:52 (7 months ago)
- Files:
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
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-7668 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-7706
django/branches/newforms-admin/django/contrib/localflavor/uk/forms.py
r6955 r7707 7 7 from django.newforms.fields import CharField, Select 8 8 from django.newforms import ValidationError 9 from django.utils.translation import ugettext 9 from django.utils.translation import ugettext_lazy as _ 10 10 11 11 class UKPostcodeField(CharField): … … 19 19 """ 20 20 default_error_messages = { 21 'invalid': ugettext(u'Enter a valid postcode.'),21 'invalid': _(u'Enter a valid postcode.'), 22 22 } 23 23 outcode_pattern = '[A-PR-UWYZ]([0-9]{1,2}|([A-HIK-Y][0-9](|[0-9]|[ABEHMNPRVWXY]))|[0-9][A-HJKSTUW])' django/branches/newforms-admin/django/contrib/localflavor/uk/uk_regions.py
r7351 r7707 6 6 Scottish regions: http://en.wikipedia.org/wiki/Regions_and_districts_of_Scotland 7 7 """ 8 from django.utils.translation import ugettext as _8 from django.utils.translation import ugettext_lazy as _ 9 9 10 10 ENGLAND_REGION_CHOICES = (
