Author: mtredinnick
Date: 2007-09-13 17:16:59 -0500 (Thu, 13 Sep 2007)
New Revision: 6139
Added:
django/trunk/django/contrib/localflavor/nl/
django/trunk/django/contrib/localflavor/nl/__init__.py
django/trunk/django/contrib/localflavor/nl/forms.py
django/trunk/django/contrib/localflavor/nl/nl_provinces.py
Modified:
django/trunk/AUTHORS
django/trunk/tests/regressiontests/forms/localflavor.py
Log:
Fixed #5403 -- Added Dutch localflavor. Thanks, Jan Rademaker.
Modified: django/trunk/AUTHORS
===================================================================
--- django/trunk/AUTHORS 2007-09-13 21:54:48 UTC (rev 6138)
+++ django/trunk/AUTHORS 2007-09-13 22:16:59 UTC (rev 6139)
@@ -237,7 +237,7 @@
[EMAIL PROTECTED]
Jyrki Pulliainen <[EMAIL PROTECTED]>
Johann Queuniet <[EMAIL PROTECTED]>
- J. Rademaker
+ Jan Rademaker
Michael Radziej <[EMAIL PROTECTED]>
Amit Ramon <[EMAIL PROTECTED]>
Massimiliano Ravelli <[EMAIL PROTECTED]>
Added: django/trunk/django/contrib/localflavor/nl/__init__.py
===================================================================
Added: django/trunk/django/contrib/localflavor/nl/forms.py
===================================================================
--- django/trunk/django/contrib/localflavor/nl/forms.py
(rev 0)
+++ django/trunk/django/contrib/localflavor/nl/forms.py 2007-09-13 22:16:59 UTC
(rev 6139)
@@ -0,0 +1,92 @@
+"""
+NL-specific Form helpers
+"""
+
+import re
+
+from django.newforms import ValidationError
+from django.newforms.fields import Field, Select, EMPTY_VALUES
+from django.utils.translation import ugettext as _
+from django.utils.encoding import smart_unicode
+
+pc_re = re.compile('^\d{4}[A-Z]{2}$')
+sofi_re = re.compile('^\d{9}$')
+numeric_re = re.compile('^\d+$')
+
+class NLZipCodeField(Field):
+ """
+ A Dutch postal code field.
+ """
+ def clean(self, value):
+ super(NLZipCodeField, self).clean(value)
+ if value in EMPTY_VALUES:
+ return u''
+
+ msg = _('Enter a valid postal code')
+ value = value.strip().upper().replace(' ', '')
+ if not pc_re.search(value):
+ raise ValidationError(msg)
+
+ if int(value[:4]) < 1000:
+ raise ValidationError(msg)
+
+ return u'%s %s' % (value[:4], value[4:])
+
+class NLProvinceSelect(Select):
+ """
+ A Select widget that uses a list of provinces of the Netherlands as its
+ choices.
+ """
+ def __init__(self, attrs=None):
+ from nl_provinces import PROVINCE_CHOICES
+ super(NLProvinceSelect, self).__init__(attrs, choices=PROVINCE_CHOICES)
+
+class NLPhoneNumberField(Field):
+ """
+ A Dutch telephone number field.
+ """
+ def clean(self, value):
+ super(NLPhoneNumberField, self).clean(value)
+ if value in EMPTY_VALUES:
+ return u''
+
+ msg = _('Enter a valid phone number')
+ phone_nr = re.sub('[\-\s\(\)]', '', smart_unicode(value))
+
+ if len(phone_nr) == 10 and numeric_re.search(phone_nr):
+ return value
+
+ if phone_nr[:3] == '+31' and len(phone_nr) == 12 and \
+ numeric_re.search(phone_nr[3:]):
+ return value
+
+ raise ValidationError(msg)
+
+class NLSoFiNumberField(Field):
+ """
+ A Dutch social security number (SoFi/BSN) field.
+
+ http://nl.wikipedia.org/wiki/Sofinummer
+ """
+ def clean(self, value):
+ super(NLSoFiNumberField, self).clean(value)
+ if value in EMPTY_VALUES:
+ return u''
+
+ msg = _('Enter a valid SoFi number')
+
+ if not sofi_re.search(value):
+ raise ValidationError(msg)
+
+ if int(value) == 0:
+ raise ValidationError(msg)
+
+ checksum = 0
+ for i in range(9, 1, -1):
+ checksum += int(value[9-i]) * i
+ checksum -= int(value[-1])
+
+ if checksum % 11 != 0:
+ raise ValidationError(msg)
+
+ return value
Added: django/trunk/django/contrib/localflavor/nl/nl_provinces.py
===================================================================
--- django/trunk/django/contrib/localflavor/nl/nl_provinces.py
(rev 0)
+++ django/trunk/django/contrib/localflavor/nl/nl_provinces.py 2007-09-13
22:16:59 UTC (rev 6139)
@@ -0,0 +1,16 @@
+from django.utils.translation import ugettext_lazy as _
+
+PROVINCE_CHOICES = (
+ ('DR', _('Drente')),
+ ('FL', _('Flevoland')),
+ ('FR', _('Friesland')),
+ ('GL', _('Gelderland')),
+ ('GR', _('Groningen')),
+ ('LB', _('Limburg')),
+ ('NB', _('Noord-Brabant')),
+ ('NH', _('Noord-Holland')),
+ ('OV', _('Overijssel')),
+ ('UT', _('Utrecht')),
+ ('ZE', _('Zeeland')),
+ ('ZH', _('Zuid-Holland')),
+)
Modified: django/trunk/tests/regressiontests/forms/localflavor.py
===================================================================
--- django/trunk/tests/regressiontests/forms/localflavor.py 2007-09-13
21:54:48 UTC (rev 6138)
+++ django/trunk/tests/regressiontests/forms/localflavor.py 2007-09-13
22:16:59 UTC (rev 6139)
@@ -1446,4 +1446,72 @@
Traceback (most recent call last):
...
ValidationError: [u'National Identification Number consists of 11 digits.']
+
+# NLPhoneNumberField ########################################################
+
+>>> from django.contrib.localflavor.nl.forms import NLPhoneNumberField
+>>> f = NLPhoneNumberField(required=False)
+>>> f.clean('')
+u''
+>>> f.clean('012-3456789')
+'012-3456789'
+>>> f.clean('0123456789')
+'0123456789'
+>>> f.clean('+31-12-3456789')
+'+31-12-3456789'
+>>> f.clean('(0123) 456789')
+'(0123) 456789'
+>>> f.clean('foo')
+Traceback (most recent call last):
+ ...
+ValidationError: [u'Enter a valid phone number']
+
+# NLZipCodeField ############################################################
+
+>>> from django.contrib.localflavor.nl.forms import NLZipCodeField
+>>> f = NLZipCodeField(required=False)
+>>> f.clean('')
+u''
+>>> f.clean('1234ab')
+u'1234 AB'
+>>> f.clean('1234 ab')
+u'1234 AB'
+>>> f.clean('1234 AB')
+u'1234 AB'
+>>> f.clean('0123AB')
+Traceback (most recent call last):
+ ...
+ValidationError: [u'Enter a valid postal code']
+>>> f.clean('foo')
+Traceback (most recent call last):
+ ...
+ValidationError: [u'Enter a valid postal code']
+
+# NLSoFiNumberField #########################################################
+
+>>> from django.contrib.localflavor.nl.forms import NLSoFiNumberField
+>>> f = NLSoFiNumberField(required=False)
+>>> f.clean('')
+u''
+>>> f.clean('123456782')
+'123456782'
+>>> f.clean('000000000')
+Traceback (most recent call last):
+ ...
+ValidationError: [u'Enter a valid SoFi number']
+>>> f.clean('123456789')
+Traceback (most recent call last):
+ ...
+ValidationError: [u'Enter a valid SoFi number']
+>>> f.clean('foo')
+Traceback (most recent call last):
+ ...
+ValidationError: [u'Enter a valid SoFi number']
+
+# NLProvinceSelect ##########################################################
+
+>>> from django.contrib.localflavor.nl.forms import NLProvinceSelect
+>>> s = NLProvinceSelect()
+>>> s.render('provinces', 'OV')
+u'<select name="provinces">\n<option value="DR">Drente</option>\n<option
value="FL">Flevoland</option>\n<option value="FR">Friesland</option>\n<option
value="GL">Gelderland</option>\n<option value="GR">Groningen</option>\n<option
value="LB">Limburg</option>\n<option value="NB">Noord-Brabant</option>\n<option
value="NH">Noord-Holland</option>\n<option value="OV"
selected="selected">Overijssel</option>\n<option
value="UT">Utrecht</option>\n<option value="ZE">Zeeland</option>\n<option
value="ZH">Zuid-Holland</option>\n</select>'
"""
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"Django updates" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to [EMAIL PROTECTED]
For more options, visit this group at
http://groups.google.com/group/django-updates?hl=en
-~----------~----~----~----~------~----~------~--~---
