diff options
| author | Dan McGee <dan@archlinux.org> | 2015-04-02 08:11:14 -0500 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2015-04-02 08:18:57 -0500 |
| commit | ffa9a3ca80dad541344571aa08b96372fd11ecaa (patch) | |
| tree | 3e77cabbd4d3df9f7da20caf1528363841a80dcc | |
| parent | 30bb320ed7be084e8b86e050d426f20d4b5a9045 (diff) | |
Update to latest django-countries
Signed-off-by: Dan McGee <dan@archlinux.org>
| -rw-r--r-- | requirements.txt | 2 | ||||
| -rw-r--r-- | requirements_prod.txt | 2 | ||||
| -rw-r--r-- | settings.py | 8 |
3 files changed, 9 insertions, 3 deletions
diff --git a/requirements.txt b/requirements.txt index c58422f7..42e0a6a8 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,7 +5,7 @@ Jinja2==2.7.3 Markdown==2.6.1 MarkupSafe==0.23 bencode==1.0 -django-countries==3.2 +django-countries==3.3 django-jinja==1.3.0 jsmin==2.1.1 pgpdump==1.5 diff --git a/requirements_prod.txt b/requirements_prod.txt index 087586fa..b0d7cfec 100644 --- a/requirements_prod.txt +++ b/requirements_prod.txt @@ -5,7 +5,7 @@ Jinja2==2.7.3 Markdown==2.6.1 MarkupSafe==0.23 bencode==1.0 -django-countries==3.2 +django-countries==3.3 django-jinja==1.3.0 jsmin==2.1.1 pgpdump==1.5 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 * |