summaryrefslogtreecommitdiff
path: root/settings.py
diff options
context:
space:
mode:
authorNicolás Reynolds <fauno@kiwwwi.com.ar>2011-01-09 17:52:29 -0300
committerNicolás Reynolds <fauno@kiwwwi.com.ar>2011-01-09 17:52:29 -0300
commit5c168b231a814c033264326b39084f184c06e0c4 (patch)
treec96380294e52ffcb46893fc7647532ba8c235d3c /settings.py
parentb3232ae7e075e551145017b6a698968124003f8e (diff)
more merge
Diffstat (limited to 'settings.py')
-rw-r--r--settings.py23
1 files changed, 6 insertions, 17 deletions
diff --git a/settings.py b/settings.py
index f98f709c..8e916e36 100644
--- a/settings.py
+++ b/settings.py
@@ -6,9 +6,7 @@ DEBUG = False
TEMPLATE_DEBUG = DEBUG
## Notification admins
-ADMINS = (
- ('Dan McGee', 'dan@archlinux.org'),
-)
+ADMINS = ()
# Set managers to admins
MANAGERS = ADMINS
@@ -31,14 +29,6 @@ DEFAULT_CHARSET = 'utf-8'
SITE_ID = 1
-# If you set this to False, Django will make some optimizations so as not
-# to load the internationalization machinery.
-USE_I18N = False
-
-# If you set this to False, Django will not format dates, numbers and
-# calendars according to the current locale
-USE_L10N = False
-
# Default date format in templates for 'date' filter
DATE_FORMAT = 'Y-m-d'
@@ -47,10 +37,13 @@ DATE_FORMAT = 'Y-m-d'
# Examples: "http://foo.com/media/", "/media/".
ADMIN_MEDIA_PREFIX = '/media/admin_media/'
-# login url
+# Login URL configuration
LOGIN_URL = '/login/'
LOGIN_REDIRECT_URL = '/'
+# Set django's User stuff to use our profile model
+AUTH_PROFILE_MODULE = 'main.UserProfile'
+
# List of callables that know how to import templates from various sources.
TEMPLATE_LOADERS = (
'django.template.loaders.filesystem.load_template_source',
@@ -96,12 +89,8 @@ TEMPLATE_LOADERS = (
'django.template.loaders.app_directories.Loader',
)
-# Set django's User stuff to use our profile model
-# format is app.model
-AUTH_PROFILE_MODULE = 'main.UserProfile'
-
+# Configure where sessions and messages should reside
MESSAGE_STORAGE = 'django.contrib.messages.storage.session.SessionStorage'
-
SESSION_ENGINE = 'django.contrib.sessions.backends.cached_db'
INSTALLED_APPS = (