Merge branch 'master' of stigma:platforma

[redakcja.git] / project / settings.py

diff --git a/project/settings.py b/project/settings.py
index 22d9bdd..143f292 100644 (file)
--- a/project/settings.py
+++ b/project/settings.py
@@ -30,6 +30,9 @@ TIME_ZONE = 'Europe/Warsaw Poland'
 # http://www.i18nguy.com/unicode/language-identifiers.html
 LANGUAGE_CODE = 'pl'
 
 # http://www.i18nguy.com/unicode/language-identifiers.html
 LANGUAGE_CODE = 'pl'
 

+import locale
+locale.setlocale(locale.LC_ALL, '')
+

 SITE_ID = 1
 
 # If you set this to False, Django will make some optimizations so as not
 SITE_ID = 1
 
 # If you set this to False, Django will make some optimizations so as not


@@ -66,7 +69,7 @@ TEMPLATE_CONTEXT_PROCESSORS = (
     "django.core.context_processors.auth",
     "django.core.context_processors.debug",
     "django.core.context_processors.i18n",
     "django.core.context_processors.auth",
     "django.core.context_processors.debug",
     "django.core.context_processors.i18n",

-    "django.core.context_processors.media",
+    "explorer.context_processors.settings",

     "django.core.context_processors.request",
 )
 
     "django.core.context_processors.request",
 )
 


@@ -77,12 +80,14 @@ MIDDLEWARE_CLASSES = (
     'django.contrib.auth.middleware.AuthenticationMiddleware',
     'explorer.middleware.EditorSettingsMiddleware',
     'django.middleware.doc.XViewMiddleware',
     'django.contrib.auth.middleware.AuthenticationMiddleware',
     'explorer.middleware.EditorSettingsMiddleware',
     'django.middleware.doc.XViewMiddleware',

+
+    'maintenancemode.middleware.MaintenanceModeMiddleware',

 )
 
 ROOT_URLCONF = 'urls'
 
 TEMPLATE_DIRS = (
 )
 
 ROOT_URLCONF = 'urls'
 
 TEMPLATE_DIRS = (

-    PROJECT_ROOT + '/templates'
+    PROJECT_ROOT + '/templates',

 )
 
 # CSS and JS files to compress
 )
 
 # CSS and JS files to compress


@@ -113,6 +118,8 @@ INSTALLED_APPS = (
     
     'explorer',
     'toolbar',
     
     'explorer',
     'toolbar',

+    'api',
+    'wysiwyg',

 )
 
 
 )
 
 


@@ -126,6 +133,19 @@ EDITOR_DEFAULT_SETTINGS = {
     ],
 }
 
     ],
 }
 

+# Python logging settings
+import logging
+
+log = logging.getLogger('platforma')
+log.setLevel(logging.DEBUG)
+ch = logging.StreamHandler()
+ch.setLevel(logging.DEBUG)
+formatter = logging.Formatter('%(asctime)s - %(name)s - %(levelname)s - %(message)s')
+ch.setFormatter(formatter)
+log.addHandler(ch)
+
+
+# Import localsettings file, which may override settings defined here

 try:
     from localsettings import *
 except ImportError:
 try:
     from localsettings import *
 except ImportError: