Author: adrian
Date: 2007-04-26 10:05:47 -0500 (Thu, 26 Apr 2007)
New Revision: 5099
Modified:
django/trunk/django/contrib/localflavor/br/forms.py
django/trunk/tests/regressiontests/forms/localflavor.py
Log:
Fixed inconsistent period usage in localflavor.br error messages from [5089]
Modified: django/trunk/django/contrib/localflavor/br/forms.py
===================================================================
--- django/trunk/django/contrib/localflavor/br/forms.py 2007-04-26 14:59:27 UTC
(rev 5098)
+++ django/trunk/django/contrib/localflavor/br/forms.py 2007-04-26 15:05:47 UTC
(rev 5099)
@@ -31,7 +31,7 @@
class BRStateSelect(Select):
"""
- A Select widget that uses a list of brazilian states/territories
+ A Select widget that uses a list of Brazilian states/territories
as its choices.
"""
def __init__(self, attrs=None):
@@ -47,7 +47,7 @@
class BRCPFField(CharField):
"""
This field validate a CPF number or a CPF string. A CPF number is
- compounded by XXX.XXX.XXX-VD, the two last digits are check digits.
+ compounded by XXX.XXX.XXX-VD. The two last digits are check digits.
More information:
http://en.wikipedia.org/wiki/Cadastro_de_Pessoas_F%C3%ADsicas
@@ -69,7 +69,7 @@
try:
int(value)
except ValueError:
- raise ValidationError(gettext("This field requires only numbers"))
+ raise ValidationError(gettext("This field requires only numbers."))
if len(value) != 11:
raise ValidationError(gettext("This field requires at most 11
digits or 14 characters."))
orig_dv = value[-2:]
@@ -100,7 +100,7 @@
try:
int(value)
except ValueError:
- raise ValidationError("This field requires only numbers")
+ raise ValidationError("This field requires only numbers.")
if len(value) != 14:
raise ValidationError(
gettext("This field requires at least 14 digits"))
@@ -113,7 +113,7 @@
new_2dv = DV_maker(new_2dv % 11)
value = value[:-1] + str(new_2dv)
if value[-2:] != orig_dv:
- raise ValidationError(gettext("Invalid CNPJ number"))
+ raise ValidationError(gettext("Invalid CNPJ number."))
return orig_value
Modified: django/trunk/tests/regressiontests/forms/localflavor.py
===================================================================
--- django/trunk/tests/regressiontests/forms/localflavor.py 2007-04-26
14:59:27 UTC (rev 5098)
+++ django/trunk/tests/regressiontests/forms/localflavor.py 2007-04-26
15:05:47 UTC (rev 5099)
@@ -851,15 +851,15 @@
>>> f.clean('12-345-678/9012-10')
Traceback (most recent call last):
...
-ValidationError: [u'Invalid CNPJ number']
+ValidationError: [u'Invalid CNPJ number.']
>>> f.clean('12.345.678/9012-10')
Traceback (most recent call last):
...
-ValidationError: [u'Invalid CNPJ number']
+ValidationError: [u'Invalid CNPJ number.']
>>> f.clean('12345678/9012-10')
Traceback (most recent call last):
...
-ValidationError: [u'Invalid CNPJ number']
+ValidationError: [u'Invalid CNPJ number.']
>>> f.clean('64.132.916/0001-88')
'64.132.916/0001-88'
>>> f.clean('64-132-916/0001-88')
@@ -869,7 +869,7 @@
>>> f.clean('64.132.916/0001-XX')
Traceback (most recent call last):
...
-ValidationError: [u'This field requires only numbers']
+ValidationError: [u'This field requires only numbers.']
>>> f = BRCNPJField(required=False)
>>> f.clean('')
u''
--~--~---------~--~----~------------~-------~--~----~
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
-~----------~----~----~----~------~----~------~--~---
