Commit 46648b64 authored by Aymeric Augustin's avatar Aymeric Augustin
Browse files

Fixed #17798 -- Tweaked the CA localflavor.

Thanks shelldweller.
parent 73f7d346
Loading
Loading
Loading
Loading
+1 −5
Original line number Diff line number Diff line
@@ -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 
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 = ( 
    ('AB', 'Alberta'), 
@@ -56,6 +51,7 @@ PROVINCES_NORMALIZED = {
    'pei': 'PE',
    'p.e.i.': 'PE',
    'prince edward island': 'PE',
    'pq' : 'QC',
    'qc': 'QC',
    'quebec': 'QC',
    'sk': 'SK',
+3 −0
Original line number Diff line number Diff line
@@ -44,6 +44,9 @@ Django 1.5 also includes several smaller improvements worth noting:
* :mod:`django.utils.timezone` provides a helper for converting aware
  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
=====================================

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