summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRussell Keith-Magee <russell@keith-magee.com>2009-02-22 11:25:25 +0000
committerRussell Keith-Magee <russell@keith-magee.com>2009-02-22 11:25:25 +0000
commiteb442961f57536127eedc6106d269592b0d37e27 (patch)
tree686717689a8c11e88d75162bc7363c582df4f166
parentc2807db68371dd84edb8244e748cb14a8a30c6df (diff)
[1.0.X] Fixed #10307 -- Removed references to FM/Federated States of Micronesia from the US localflavor STATES_NORMALIZED setting. Thanks to mnd for the report.
Merge of r9855 from trunk. git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9885 bcc190cf-cafb-0310-a4f2-bffc1f526a37
-rw-r--r--django/contrib/localflavor/us/us_states.py3
1 files changed, 0 insertions, 3 deletions
diff --git a/django/contrib/localflavor/us/us_states.py b/django/contrib/localflavor/us/us_states.py
index 4275efdfca..59c48bb4d3 100644
--- a/django/contrib/localflavor/us/us_states.py
+++ b/django/contrib/localflavor/us/us_states.py
@@ -96,11 +96,9 @@ STATES_NORMALIZED = {
'delaware': 'DE',
'deleware': 'DE',
'district of columbia': 'DC',
- 'federated states of micronesia': 'FM',
'fl': 'FL',
'fla': 'FL',
'florida': 'FL',
- 'fm': 'FM',
'ga': 'GA',
'georgia': 'GA',
'gu': 'GU',
@@ -139,7 +137,6 @@ STATES_NORMALIZED = {
'mi': 'MI',
'mich': 'MI',
'michigan': 'MI',
- 'micronesia': 'FM',
'minn': 'MN',
'minnesota': 'MN',
'miss': 'MS',