Ticket #8798: ticket8798-r8849.diff

django/contrib/localflavor/de/forms.py

@@ -4 +4 @@
 
 from django.forms import ValidationError
 from django.forms.fields import Field, RegexField, Select, EMPTY_VALUES
+from django.utils.encoding import smart_unicode
 from django.utils.translation import ugettext_lazy as _
 import re
 
 id_re = re.compile(r"^(?P<residence>\d{10})(?P<origin>\w{1,3})[-\ ]?(?P<birthday>\d{7})[-\ ]?(?P<validity>\d{7})[-\ ]?(?P<checksum>\d{1})$")
+phone_digits_re= re.compile(r"^(((\+\d{2,3})?\s\(([^0]{1}\d{1,6}\)|0\)\d{1,5})|\(\d{1,2}(\s?\d{1,2}){1,2}\))\s(\d{1,2}(\s?\d{1,2}){1,2})((-(\d{1,4}))?))|(\+\d{2,3}\s?\d{1,5}|0\d{1,6})\s?(\d\s)?\d+(-?\d{1,5})?$")
 
 class DEZipCodeField(RegexField):
     default_error_messages = {
@@ -17 +19 @@
         super(DEZipCodeField, self).__init__(r'^\d{5}$',
             max_length=None, min_length=None, *args, **kwargs)
 
+class DEPhoneNumberField(RegexField):
+    """
+    A form field that validates telephone numbers following several standards
+    used in Austria and Germany (national and international):
+
+        * DIN 5008 (new)
+        * DIN 5008 (old)
+        * E.123
+        * Informal convention
+    """
+    default_error_messages = {
+        'invalid': _('Enter the phone number in a supported format: DIN 5008, E.123, Microsoft/TAPI.'),
+    }
+    def __init__(self, *args, **kwargs):
+        super(DEPhoneNumberField, self).__init__(phone_digits_re, *args, **kwargs)
+
+    def clean(self, value):
+        value = super(DEPhoneNumberField, self).clean(value)
+        if value in EMPTY_VALUES:
+            return u''
+        return value
+
 class DEStateSelect(Select):
     """
     A Select widget that uses a list of DE states as its choices.

docs/ref/contrib/localflavor.txt

@@ -286 +286 @@
 
     A ``Select`` widget that uses a list of German states as its choices.
 
+.. class:: de.forms.DEPhoneNumberField
+
+    A form field that validates input as a telephone number following
+    `several standards`_ used in Austria and Germany (national and
+    international notation):
+
+        * DIN 5008 (new)
+        * DIN 5008 (old)
+        * E.123
+        * Informal
+
+.. _several standards: http://de.wikipedia.org/wiki/Rufnummer#Schreibweisen
+
 Holland (``nl``)
 ================
 

tests/regressiontests/forms/localflavor/de.py

@@ -13 +13 @@
 ...
 ValidationError: [u'Enter a zip code in the format XXXXX.']
 
+# DEPhoneDIN5008Field #############################################################
+
+>>> from django.contrib.localflavor.de.forms import DEPhoneNumberField
+>>> f = DEPhoneNumberField()
+>>> f.clean('030 12345-67') # new DIN 5008
+u'030 12345-67'
+>>> f.clean('030 1234567') # new DIN 5008
+u'030 1234567'
+>>> f.clean('0301234567') # lazy DIN 5008
+u'0301234567'
+>>> f.clean('(0 30) 1 23 45-67') # old DIN 5008
+u'(0 30) 1 23 45-67'
+>>> f.clean('(0 30) 1 23 456') # old DIN 5008
+u'(0 30) 1 23 456'
+>>> f.clean('0900 5 123456') # DIN 5008 Premium rate numbers
+u'0900 5 123456'
+>>> f.clean('(030) 123 45 67') # E.123
+u'(030) 123 45 67'
+>>> f.clean('+49 (30) 1234567') # Microsoft/TAPI
+u'+49 (30) 1234567'
+>>> f.clean('+49 (0)30 12345-67') # Informal standard in Germany and Austria
+u'+49 (0)30 12345-67'
+>>> f.clean('+49 30 12345-67') # DIN 5008
+u'+49 30 12345-67'
+>>> f.clean('+49 30 1234567') # E.123
+u'+49 30 1234567'
+>>> f.clean('+49 30 12345-67') # E.123
+u'+49 30 12345-67'
+>>> f.clean('+49301234567') # Lazy E.123
+u'+49301234567'
+>>> f.clean('+49 30 12345--67')
+Traceback (most recent call last):
+...
+ValidationError: [u'Enter the phone number in a supported format: DIN 5008, E.123, Microsoft/TAPI.']
+>>> f.clean('+49 (030) 1234567')
+Traceback (most recent call last):
+...
+ValidationError: [u'Enter the phone number in a supported format: DIN 5008, E.123, Microsoft/TAPI.']
+>>> f.clean('(030) (123) 45 67')
+Traceback (most recent call last):
+...
+ValidationError: [u'Enter the phone number in a supported format: DIN 5008, E.123, Microsoft/TAPI.']
+>>> f.clean('abcdefg')
+Traceback (most recent call last):
+ValidationError: [u'Enter the phone number in a supported format: DIN 5008, E.123, Microsoft/TAPI.']
+>>> f.clean(None)
+Traceback (most recent call last):
+...
+ValidationError: [u'This field is required.']
+>>> f = DEPhoneNumberField(required=False)
+>>> f.clean(None)
+u''
+>>> f.clean('')
+u''
+
+
 # DEStateSelect #############################################################
 
 >>> from django.contrib.localflavor.de.forms import DEStateSelect