diff options
Diffstat (limited to 'django')
| -rw-r--r-- | django/contrib/localflavor/in_/forms.py | 18 | ||||
| -rw-r--r-- | django/contrib/localflavor/in_/in_states.py | 94 |
2 files changed, 85 insertions, 27 deletions
diff --git a/django/contrib/localflavor/in_/forms.py b/django/contrib/localflavor/in_/forms.py index c94c7e7a1e..afc5534f92 100644 --- a/django/contrib/localflavor/in_/forms.py +++ b/django/contrib/localflavor/in_/forms.py @@ -1,24 +1,32 @@ """ India-specific Form helpers. """ +import re from django.core.validators import EMPTY_VALUES from django.forms import ValidationError from django.forms.fields import Field, RegexField, Select from django.utils.encoding import smart_unicode -from django.utils.translation import gettext -import re +from django.utils.translation import ugettext_lazy as _ class INZipCodeField(RegexField): default_error_messages = { - 'invalid': gettext(u'Enter a zip code in the format XXXXXXX.'), + 'invalid': _(u'Enter a zip code in the format XXXXXX or XXX XXX.'), } def __init__(self, max_length=None, min_length=None, *args, **kwargs): - super(INZipCodeField, self).__init__(r'^\d{6}$', + super(INZipCodeField, self).__init__(r'^\d{3}\s?\d{3}$', max_length, min_length, *args, **kwargs) + def clean(self, value): + super(INZipCodeField, self).clean(value) + if value in EMPTY_VALUES: + return u'' + # Convert to "NNNNNN" if "NNN NNN" given + value = re.sub(r'^(\d{3})\s(\d{3})$', r'\1\2', value) + return value + class INStateField(Field): """ A form field that validates its input is a Indian state name or @@ -26,7 +34,7 @@ class INStateField(Field): registration abbreviation for the given state or union territory """ default_error_messages = { - 'invalid': u'Enter a Indian state or territory.', + 'invalid': _(u'Enter an Indian state or territory.'), } def clean(self, value): diff --git a/django/contrib/localflavor/in_/in_states.py b/django/contrib/localflavor/in_/in_states.py index 25b220b94a..375b201311 100644 --- a/django/contrib/localflavor/in_/in_states.py +++ b/django/contrib/localflavor/in_/in_states.py @@ -47,37 +47,87 @@ STATE_CHOICES = ( ) STATES_NORMALIZED = { - 'ka': 'KA', - 'karnatka': 'KA', - 'tn': 'TN', - 'tamilnad': 'TN', - 'tamilnadu': 'TN', + 'an': 'AN', + 'andaman and nicobar': 'AN', 'andra pradesh': 'AP', 'andrapradesh': 'AP', 'andhrapradesh': 'AP', - 'maharastra': 'MH', - 'mh': 'MH', 'ap': 'AP', - 'dl': 'DL', - 'dd': 'DD', - 'br': 'BR', + 'andhra pradesh': 'AP', 'ar': 'AR', - 'sk': 'SK', - 'kl': 'KL', + 'arunachal pradesh': 'AR', + 'assam': 'AS', + 'as': 'AS', + 'bihar': 'BR', + 'br': 'BR', + 'cg': 'CG', + 'chattisgarh': 'CG', + 'ch': 'CH', + 'chandigarh': 'CH', + 'daman and diu': 'DD', + 'dd': 'DD', + 'dl': 'DL', + 'delhi': 'DL', + 'dn': 'DN', + 'dadra and nagar haveli': 'DN', 'ga': 'GA', - 'rj': 'RJ', - 'rajastan': 'RJ', - 'rajasthan': 'RJ', + 'goa': 'GA', + 'gj': 'GJ', + 'gujarat': 'GJ', + 'himachal pradesh': 'HP', 'hp': 'HP', - 'ua': 'UA', - 'up': 'UP', + 'hr': 'HR', + 'haryana': 'HR', + 'jharkhand': 'JH', + 'jh': 'JH', + 'jammu and kashmir': 'JK', + 'jk': 'JK', + 'karnataka': 'KA', + 'karnatka': 'KA', + 'ka': 'KA', + 'kerala': 'KL', + 'kl': 'KL', + 'ld': 'LD', + 'lakshadweep': 'LD', + 'maharastra': 'MH', + 'mh': 'MH', + 'maharashtra': 'MH', + 'meghalaya': 'ML', + 'ml': 'ML', + 'mn': 'MN', + 'manipur': 'MN', + 'madhya pradesh': 'MP', 'mp': 'MP', - 'mz': 'MZ', - 'bengal': 'WB', - 'westbengal': 'WB', + 'mizoram': 'MZ', 'mizo': 'MZ', - 'orisa': 'OR', + 'mz': 'MZ', + 'nl': 'NL', + 'nagaland': 'NL', + 'orissa': 'OR', 'odisa': 'OR', + 'orisa': 'OR', 'or': 'OR', + 'pb': 'PB', + 'punjab': 'PB', + 'py': 'PY', + 'pondicherry': 'PY', + 'rajasthan': 'RJ', + 'rajastan': 'RJ', + 'rj': 'RJ', + 'sikkim': 'SK', + 'sk': 'SK', + 'tamil nadu': 'TN', + 'tn': 'TN', + 'tamilnadu': 'TN', + 'tamilnad': 'TN', + 'tr': 'TR', + 'tripura': 'TR', + 'ua': 'UA', + 'uttarakhand': 'UA', + 'up': 'UP', + 'uttar pradesh': 'UP', + 'westbengal': 'WB', + 'bengal': 'WB', + 'wb': 'WB', + 'west bengal': 'WB' } - |