diff options
| author | Luke Shumaker <lukeshu@sbcglobal.net> | 2015-04-16 02:38:51 -0400 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2015-04-16 02:38:51 -0400 |
| commit | c8d979b8a48805d162ab46cdc4e493da0aa1595c (patch) | |
| tree | 6846db4f47e29a3fb6a951383ec764a897d3ab85 /settings.py | |
| parent | 4d4f76a4fd24891669c254b86b0173258b719b0e (diff) | |
| parent | 790def2f4db2afec150bab8dc842f6068fb751db (diff) | |
Merge tag 'release_2015-04-13' into archweb-generic
Fix up 'None' display in places
Diffstat (limited to 'settings.py')
| -rw-r--r-- | settings.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/settings.py b/settings.py index 3d0319c6..b3b27323 100644 --- a/settings.py +++ b/settings.py @@ -152,11 +152,10 @@ LOGGING = { 'handlers': ['mail_admins'], 'level': 'ERROR', 'propagate': True, - }, + } }, } - ## Server used for linking to PGP keysearch results PGP_SERVER = 'pgp.mit.edu:11371' @@ -198,9 +197,10 @@ BRANDING_WIKINAME = 'ArchWiki' BRANDING_EMAIL = 'Arch Website Notification <nobody@archlinux.org>' BRANDING_OSEARCH_TAGS = 'linux archlinux package software' -# Country name overrides for display purposes +# Shorten some names just a bit COUNTRIES_OVERRIDE = { - 'MK': 'Macedonia', + 'GB': 'United Kingdom', + 'US': 'United States', } ## Import local settings |