From 047dc3d6348d0d30bdd828a9cc2a29e0d5946eca Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Mon, 19 Jan 2015 09:01:45 -0600 Subject: Update to latest django-countries Signed-off-by: Dan McGee --- settings.py | 6 ------ 1 file changed, 6 deletions(-) (limited to 'settings.py') diff --git a/settings.py b/settings.py index 60fe71bc..3f0f8e69 100644 --- a/settings.py +++ b/settings.py @@ -155,7 +155,6 @@ LOGGING = { }, } - ## Server used for linking to PGP keysearch results PGP_SERVER = 'pgp.mit.edu:11371' @@ -175,11 +174,6 @@ TORRENT_TRACKERS = ( 'http://tracker.archlinux.org:6969/announce', ) -# Country name overrides for display purposes -COUNTRIES_OVERRIDE = { - 'MK': 'Macedonia', -} - ## Import local settings from local_settings import * -- cgit v1.2.3 From ffa9a3ca80dad541344571aa08b96372fd11ecaa Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Thu, 2 Apr 2015 08:11:14 -0500 Subject: Update to latest django-countries Signed-off-by: Dan McGee --- settings.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'settings.py') diff --git a/settings.py b/settings.py index 3f0f8e69..0423541c 100644 --- a/settings.py +++ b/settings.py @@ -151,7 +151,7 @@ LOGGING = { 'handlers': ['mail_admins'], 'level': 'ERROR', 'propagate': True, - }, + } }, } @@ -174,6 +174,12 @@ TORRENT_TRACKERS = ( 'http://tracker.archlinux.org:6969/announce', ) +# Shorten some names just a bit +COUNTRIES_OVERRIDE = { + 'GB': 'United Kingdom', + 'US': 'United States', +} + ## Import local settings from local_settings import * -- cgit v1.2.3