Reverting the merges due to unsuccessfull conflict resolvement.

[osqa.git] / settings.py

diff --git a/settings.py b/settings.py
index 61c47a8279411bc8370c6baffba665e1960ec291..6e7c106c3b886128e8366366b9e1f5f834b8504c 100644 (file)
--- a/settings.py
+++ b/settings.py
@@ -1,4 +1,5 @@
 # encoding:utf-8
+# Django settings for lanai project.
 import os.path
 import sys
 
@@ -6,18 +7,24 @@ SITE_ID = 1
 
 ADMIN_MEDIA_PREFIX = '/admin_media/'
 SECRET_KEY = '$oo^&_m&qwbib=(_4m_n*zn-d=g#s0he5fx9xonnym#8p6yigm'
-
-TEMPLATE_LOADERS = [
+# List of callables that know how to import templates from various sources.
+TEMPLATE_LOADERS = (
     'django.template.loaders.filesystem.load_template_source',
     'django.template.loaders.app_directories.load_template_source',
-    'forum.modules.template_loader.module_templates_loader',
+    'forum.modules.module_templates_loader',
     'forum.skins.load_template_source',
-]
+#     'django.template.loaders.eggs.load_template_source',
+)
 
 MIDDLEWARE_CLASSES = [
+    #'django.middleware.gzip.GZipMiddleware',
     'django.contrib.sessions.middleware.SessionMiddleware',
+    #'django.middleware.locale.LocaleMiddleware',
+    #'django.middleware.cache.UpdateCacheMiddleware',
     'django.middleware.common.CommonMiddleware',
+    #'django.middleware.cache.FetchFromCacheMiddleware',
     'forum.middleware.extended_user.ExtendedUser',
+    #'django.middleware.sqlprint.SqlPrintingMiddleware',
     'forum.middleware.anon_user.ConnectToSessionMessagesMiddleware',
     'forum.middleware.request_utils.RequestUtils',
     'forum.middleware.cancel.CancelActionMiddleware',
@@ -26,27 +33,28 @@ MIDDLEWARE_CLASSES = [
     'django.middleware.transaction.TransactionMiddleware',
 ]
 
-TEMPLATE_CONTEXT_PROCESSORS = [
+TEMPLATE_CONTEXT_PROCESSORS = (
     'django.core.context_processors.request',
     'forum.context.application_settings',
-    'forum.user_messages.context_processors.user_messages',
-    'django.core.context_processors.auth',
-]
+    #'django.core.context_processors.i18n',
+    'forum.user_messages.context_processors.user_messages',#must be before auth
+    'django.core.context_processors.auth', #this is required for admin
+)
 
 ROOT_URLCONF = 'urls'
-APPEND_SLASH = True
 
 TEMPLATE_DIRS = (
     os.path.join(os.path.dirname(__file__),'forum','skins').replace('\\','/'),
 )
 
-
+#UPLOAD SETTINGS
 FILE_UPLOAD_TEMP_DIR = os.path.join(os.path.dirname(__file__), 'tmp').replace('\\','/')
 FILE_UPLOAD_HANDLERS = ("django.core.files.uploadhandler.MemoryFileUploadHandler",
  "django.core.files.uploadhandler.TemporaryFileUploadHandler",)
 DEFAULT_FILE_STORAGE = 'django.core.files.storage.FileSystemStorage'
-
+# for user upload
 ALLOW_FILE_TYPES = ('.jpg', '.jpeg', '.gif', '.bmp', '.png', '.tiff')
+# unit byte
 ALLOW_MAX_FILE_SIZE = 1024 * 1024
 
 # User settings
@@ -72,19 +80,6 @@ for path in app_url_split[1].split('/')[1:]:
 if FORCE_SCRIPT_NAME.endswith('/'):
     FORCE_SCRIPT_NAME = FORCE_SCRIPT_NAME[:-1]
 
-from forum import modules
-
-modules.init_modules_engine(SITE_SRC_ROOT, DISABLED_MODULES)
-
-[MIDDLEWARE_CLASSES.extend(
-        ["%s.%s" % (m.__name__, mc) for mc in getattr(m, 'MIDDLEWARE_CLASSES', [])]
-                          ) for m in modules.MODULE_LIST]
-
-[TEMPLATE_LOADERS.extend(
-        ["%s.%s" % (m.__name__, tl) for tl in getattr(m, 'TEMPLATE_LOADERS', [])]
-                          ) for m in modules.MODULE_LIST]
-
-
 INSTALLED_APPS = [
     'django.contrib.auth',
     'django.contrib.contenttypes',