Ticket #10456: calocal.diff

django/contrib/localflavor/ca/ca_provinces.py

@@ +1 @@
+# -*- coding: utf-8 -*-
 """ 
 An alphabetical list of provinces and territories for use as `choices` 
 in a formfield., and a mapping of province misspellings/abbreviations to 
@@ -3 +4 @@
 normalized abbreviations
 
-Source: http://www.canada.gc.ca/othergov/prov_e.html 
+Source: http://www.canadapost.ca/tools/pg/manual/PGaddress-e.asp#1380608
 
 This exists in this standalone file so that it's only imported into memory 
@@ -14 +15 @@
     ('BC', 'British Columbia'), 
     ('MB', 'Manitoba'), 
     ('NB', 'New Brunswick'), 
-    ('NF', 'Newfoundland and Labrador'), 
+    ('NL', 'Newfoundland and Labrador'), 
     ('NT', 'Northwest Territories'), 
     ('NS', 'Nova Scotia'), 
     ('NU', 'Nunavut'), 
@@ -22 +23 @@
     ('PE', 'Prince Edward Island'), 
     ('QC', 'Quebec'), 
     ('SK', 'Saskatchewan'), 
-    ('YK', 'Yukon') 
+    ('YT', 'Yukon') 
 )
 
 PROVINCES_NORMALIZED = {
     'ab': 'AB',
+    'alta': 'AB',
+    'alta.': 'AB',
     'alberta': 'AB',
     'bc': 'BC',
     'b.c.': 'BC',
     'british columbia': 'BC',
+    'colombie-britannique': 'BC',
+    'colombie britannique': 'BC',
+    'cb': 'BC',
+    'c-b': 'BC',
     'mb': 'MB',
     'manitoba': 'MB',
     'nb': 'NB',
     'new brunswick': 'NB',
-    'nf': 'NF',
-    'newfoundland': 'NF',
-    'newfoundland and labrador': 'NF',
+    'nouveau-brunswick': 'NB',
+    'nouveau brunswick': 'NB',
+    'nf': 'NL',
+    'nl': 'NL',
+    'newfoundland': 'NL',
+    'newfoundland and labrador': 'NL',
+    'nfld': 'NL',
+    'nfld.': 'NL',
+    'terre-neuve-et-labrador': 'NL',
+    'terre-neuve et labrador': 'NL',
+    'terre-neuve': 'NL',
     'nt': 'NT',
     'northwest territories': 'NT',
+    'territoires du nord-ouest': 'NT',
     'ns': 'NS',
     'nova scotia': 'NS',
+    'nouvelle-écosse': 'NS',
+    'nouvelle-Écosse': 'NS',
+    'nouvelle écosse': 'NS',
+    'nouvelle Écosse': 'NS',
+    'nouvelle-ecosse': 'NS',
+    'nouvelle ecosse': 'NS',
     'nu': 'NU',
     'nunavut': 'NU',
     'on': 'ON',
@@ -50 +72 @@
     'pei': 'PE',
     'p.e.i.': 'PE',
     'prince edward island': 'PE',
+    'île du prince édouard': 'PE',
+    'Île du prince Édouard': 'PE',
+    'ile du prince edouard': 'PE',
+    'île-du-prince-édouard': 'PE',
+    'Île-du-prince-Édouard': 'PE',
+    'ile-du-prince-edouard': 'PE',
+    'î.p.e.': 'PE',
+    'i.p.e.': 'PE',
     'qc': 'QC',
+    'qu': 'QC',
+    'pq': 'QC',
+    'que': 'QC',
+    'que.': 'QC',
     'quebec': 'QC',
+    'québec': 'QC',
+    'quÉbec': 'QC',
     'sk': 'SK',
     'saskatchewan': 'SK',
-    'yk': 'YK',
-    'yukon': 'YK',
-}
- No newline at end of file
+    'sask': 'SK',
+    'sask.': 'SK',
+    'yk': 'YT',
+    'yt': 'YT',
+    'yukon': 'YT',
+    'yukon territory': 'YT',
+}

django/contrib/localflavor/ca/forms.py

@@ -20 +20 @@
     def __init__(self, *args, **kwargs):
         super(CAPostalCodeField, self).__init__(r'^[ABCEGHJKLMNPRSTVXYZ]\d[A-Z] \d[A-Z]\d$',
             max_length=None, min_length=None, *args, **kwargs)
+            
+    def clean(self, value):
+        if value:
+            value = str(value).upper()
+            if len(value) == 6: # Add a space if there isn't one
+                value = value[:3] + ' ' + value[3:]
+        return super(CAPostalCodeField, self).clean(value)
 
 class CAPhoneNumberField(Field):
     """Canadian phone number field."""

tests/regressiontests/forms/localflavor/ca.py

@@ -37 +37 @@
 >>> f.clean('T2S 2H7')
 u'T2S 2H7'
 >>> f.clean('T2S2H7')
-Traceback (most recent call last):
-...
-ValidationError: [u'Enter a postal code in the format XXX XXX.']
+u'T2S 2H7'
+>>> f.clean('t2s2h7')
+u'T2S 2H7'
 >>> f.clean('T2S 2H')
 Traceback (most recent call last):
 ...
@@ -171 +171 @@
 u'BC'
 >>> f.clean('nova scotia')
 u'NS'
+>>> f.clean('nf')
+u'NL'
+>>> f.clean('québec  ')
+u'QC'
 >>> f.clean('  manitoba ')
 u'MB'
 >>> f.clean('T2S 2H7')
@@ -194 +198 @@
 <option value="BC">British Columbia</option>
 <option value="MB">Manitoba</option>
 <option value="NB">New Brunswick</option>
-<option value="NF">Newfoundland and Labrador</option>
+<option value="NL">Newfoundland and Labrador</option>
 <option value="NT">Northwest Territories</option>
 <option value="NS">Nova Scotia</option>
 <option value="NU">Nunavut</option>
@@ -202 +206 @@
 <option value="PE">Prince Edward Island</option>
 <option value="QC">Quebec</option>
 <option value="SK">Saskatchewan</option>
-<option value="YK">Yukon</option>
+<option value="YT">Yukon</option>
 </select>
 
 # CASocialInsuranceNumberField #################################################