diff options
author | Luke Shumaker <LukeShu@sbcglobal.net> | 2014-05-25 19:34:21 -0400 |
---|---|---|
committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2014-05-25 19:34:21 -0400 |
commit | 1a1fd4a3d6aa7f6b2338f7751f5f97a30a059a04 (patch) | |
tree | f608874663d24f19ecf175ec556f2a330d47a726 /mirrors/migrations | |
parent | 747a562ddca10e29dd003e8b3c59f8f384d1bc8d (diff) | |
parent | cd7222047b41ac3efa389a22fdd22148d03c1d61 (diff) |
Merge tag 'release_2014-03-22' into archweb-generic
Fix long filenames; local storage for filter prefs
Conflicts:
templates/public/download.html
Diffstat (limited to 'mirrors/migrations')
-rw-r--r-- | mirrors/migrations/0015_assign_country_codes.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mirrors/migrations/0015_assign_country_codes.py b/mirrors/migrations/0015_assign_country_codes.py index c1b0f969..5d83e02c 100644 --- a/mirrors/migrations/0015_assign_country_codes.py +++ b/mirrors/migrations/0015_assign_country_codes.py @@ -4,12 +4,12 @@ from south.db import db from south.v2 import DataMigration from django.db import models -from django_countries.countries import OFFICIAL_COUNTRIES +from django_countries.data import COUNTRIES class Migration(DataMigration): def forwards(self, orm): - reverse_map = dict((v, k) for k, v in OFFICIAL_COUNTRIES.items()) + reverse_map = dict((v.upper(), k) for k, v in COUNTRIES.items()) # add a few special cases to the list that we know might exist reverse_map['GREAT BRITAIN'] = 'GB' reverse_map['KOREA'] = 'KR' |