Merge branch 'master' of stigma:platforma

[redakcja.git] / project / settings.py

diff --git a/project/settings.py b/project/settings.py
index 0551819..3a1f3ad 100644 (file)
--- a/project/settings.py
+++ b/project/settings.py
@@ -8,6 +8,7 @@ TEMPLATE_DEBUG = DEBUG
 
 ADMINS = (
     (u'Marek Stępniowski', 'marek@stepniowski.com'),
 
 ADMINS = (
     (u'Marek Stępniowski', 'marek@stepniowski.com'),

+    (u'Łukasz Rekucki', 'lrekucki@gmail.com'),

 )
 
 MANAGERS = ADMINS
 )
 
 MANAGERS = ADMINS


@@ -30,6 +31,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


@@ -84,7 +88,7 @@ MIDDLEWARE_CLASSES = (
 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


@@ -112,7 +116,8 @@ INSTALLED_APPS = (
     'django.contrib.sites',
     'django.contrib.admin',
     'django.contrib.admindocs',
     'django.contrib.sites',
     'django.contrib.admin',
     'django.contrib.admindocs',

-    
+
+    'piston',

     'explorer',
     'toolbar',
     'api',
     'explorer',
     'toolbar',
     'api',


@@ -130,6 +135,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: