Commit 744d8821 authored by Jacob Kaplan-Moss's avatar Jacob Kaplan-Moss
Browse files

Fixed #8425: removed the independant nations of Palau, Marshall Islands, and... 

Fixed #8425: removed the independant nations of Palau, Marshall Islands, and Micronesia from localflavor's list of US states.

...

Man, commit messages like that are incredibly fun to write.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@8550 bcc190cf-cafb-0310-a4f2-bffc1f526a37
parent cbd57488

django/contrib/localflavor/us/us_states.py

+0 −3
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ STATE_CHOICES = ( 
    ('CT', 'Connecticut'),

    ('DE', 'Delaware'),

    ('DC', 'District of Columbia'),

    ('FM', 'Federated States of Micronesia'),

    ('FL', 'Florida'),

    ('GA', 'Georgia'),

    ('GU', 'Guam'),
@@ -30,7 +29,6 @@ STATE_CHOICES = ( 
    ('KY', 'Kentucky'),

    ('LA', 'Louisiana'),

    ('ME', 'Maine'),

    ('MH', 'Marshall Islands'),

    ('MD', 'Maryland'),

    ('MA', 'Massachusetts'),

    ('MI', 'Michigan'),
@@ -50,7 +48,6 @@ STATE_CHOICES = ( 
    ('OH', 'Ohio'),

    ('OK', 'Oklahoma'),

    ('OR', 'Oregon'),

    ('PW', 'Palau'),

    ('PA', 'Pennsylvania'),

    ('PR', 'Puerto Rico'),

    ('RI', 'Rhode Island'),

tests/regressiontests/forms/localflavor/us.py

+0 −3
Original line number Diff line number Diff line
@@ -195,7 +195,6 @@ as its choices. 
<option value="CT">Connecticut</option>

<option value="DE">Delaware</option>

<option value="DC">District of Columbia</option>

<option value="FM">Federated States of Micronesia</option>

<option value="FL">Florida</option>

<option value="GA">Georgia</option>

<option value="GU">Guam</option>
@@ -208,7 +207,6 @@ as its choices. 
<option value="KY">Kentucky</option>

<option value="LA">Louisiana</option>

<option value="ME">Maine</option>

<option value="MH">Marshall Islands</option>

<option value="MD">Maryland</option>

<option value="MA">Massachusetts</option>

<option value="MI">Michigan</option>
@@ -228,7 +226,6 @@ as its choices. 
<option value="OH">Ohio</option>

<option value="OK">Oklahoma</option>

<option value="OR">Oregon</option>

<option value="PW">Palau</option>

<option value="PA">Pennsylvania</option>

<option value="PR">Puerto Rico</option>

<option value="RI">Rhode Island</option>