Ticket #2307: phoneNumberField.diff

django/conf/locale/pt_BR/LC_MESSAGES/django.po

@@ -1729 +1729 @@
 #, python-format
 msgid "Phone numbers must be in XXX-XXX-XXXX format. \"%s\" is invalid."
 msgstr ""
-"Números de telefone deves estar no formato XXX-XXX-XXXX.\"%s\" é inválido."
+"Números de telefone devem estar no formato XX-XXXX-XXXX.\"%s\" é inválido."
 
 #: core/validators.py:167
 #, python-format

django/core/validators.py

@@ -12 +12 @@
 from django.conf import settings
 from django.utils.translation import gettext, gettext_lazy, ngettext
 from django.utils.functional import Promise, lazy
+from django.core import regex
+import settings
 import re
 
 _datere = r'\d{4}-\d{1,2}-\d{1,2}'
@@ -27 +29 @@
     r')@(?:[A-Z0-9-]+\.)+[A-Z]{2,6}$', re.IGNORECASE)  # domain
 integer_re = re.compile(r'^-?\d+$')
 ip4_re = re.compile(r'^(25[0-5]|2[0-4]\d|[0-1]?\d?\d)(\.(25[0-5]|2[0-4]\d|[0-1]?\d?\d)){3}$')
-phone_re = re.compile(r'^[A-PR-Y0-9]{3}-[A-PR-Y0-9]{3}-[A-PR-Y0-9]{4}$', re.IGNORECASE)
 slug_re = re.compile(r'^[-\w]+$')
 url_re = re.compile(r'^https?://\S+$')
 
@@ -184 +185 @@
         raise ValidationError, gettext("The URL %s does not point to a valid image.") % field_data
 
 def isValidPhone(field_data, all_data):
+    lang = settings.LANGUAGE_CODE.replace('-', '_')
+    phone_re = getattr(regex, 'phone_%s' % lang, regex.phone_en_us)
     if not phone_re.search(field_data):
         raise ValidationError, gettext('Phone numbers must be in XXX-XXX-XXXX format. "%s" is invalid.') % field_data