Fixed #17798 -- Tweaked the CA localflavor.

Thanks shelldweller.
This commit is contained in:
Aymeric Augustin 2012-05-10 22:19:01 +02:00
parent 73f7d34699
commit 46648b641d
3 changed files with 5 additions and 5 deletions

View File

@ -8,11 +8,6 @@ Source: http://www.canada.gc.ca/othergov/prov_e.html
This exists in this standalone file so that it's only imported into memory This exists in this standalone file so that it's only imported into memory
when explicitly needed. when explicitly needed.
""" """
import warnings
warnings.warn(
'There have been recent changes to the CA localflavor. See the release notes for details',
RuntimeWarning
)
PROVINCE_CHOICES = ( PROVINCE_CHOICES = (
('AB', 'Alberta'), ('AB', 'Alberta'),
@ -56,6 +51,7 @@ PROVINCES_NORMALIZED = {
'pei': 'PE', 'pei': 'PE',
'p.e.i.': 'PE', 'p.e.i.': 'PE',
'prince edward island': 'PE', 'prince edward island': 'PE',
'pq' : 'QC',
'qc': 'QC', 'qc': 'QC',
'quebec': 'QC', 'quebec': 'QC',
'sk': 'SK', 'sk': 'SK',

View File

@ -44,6 +44,9 @@ Django 1.5 also includes several smaller improvements worth noting:
* :mod:`django.utils.timezone` provides a helper for converting aware * :mod:`django.utils.timezone` provides a helper for converting aware
datetimes between time zones. See :func:`~django.utils.timezone.localtime`. datetimes between time zones. See :func:`~django.utils.timezone.localtime`.
* In the localflavor for Canada, "pq" was added to the acceptable codes for
Quebec. It's an old abbreviation.
Backwards incompatible changes in 1.5 Backwards incompatible changes in 1.5
===================================== =====================================

View File

@ -93,6 +93,7 @@ class CALocalFlavorTests(SimpleTestCase):
'BC': 'BC', 'BC': 'BC',
'nova scotia': 'NS', 'nova scotia': 'NS',
' manitoba ': 'MB', ' manitoba ': 'MB',
'pq': 'QC',
} }
invalid = { invalid = {
'T2S 2H7': error_format, 'T2S 2H7': error_format,