Merge branch 'master' of ssh://git.onelab.eu/git/myslice

[myslice.git] / myslice / settings.py

diff --git a/myslice/settings.py b/myslice/settings.py
index b7b7b2c..70b4a87 100644 (file)
--- a/myslice/settings.py
+++ b/myslice/settings.py
@@ -34,12 +34,13 @@ if not os.path.isdir (os.path.join(HTTPROOT,"static")):
 if not os.path.isdir(ROOT): raise Exception,"Cannot find ROOT %s for unfold"%ROOT
 if not os.path.isdir(HTTPROOT): raise Exception,"Cannot find HTTPROOT %s for unfold"%HTTPROOT
 
-# dec 2013 - we currently have 3 auxiliary subdirs with various utilities
+# dec 2013 - we currently have 2 auxiliary subdirs with various utilities
 # that we do not wish to package 
-# hopefully the number should go down to 1
+# * sandbox is for plugin developers
+# * sample is for various test views
 # for each of these, if we find a directory of that name under ROOT, it then gets
 # inserted in INSTALLED_APPS and its urls get included (see urls.py)
-auxiliaries = [ 'sandbox', 'sample', 'trash', ]
+auxiliaries = [ 'sandbox', 'sample', ]
 
 ####################
 ADMINS = (
@@ -71,7 +72,7 @@ DATABASES = {
 # http://en.wikipedia.org/wiki/List_of_tz_zones_by_name
 # although not all choices may be available on all operating systems.
 # In a Windows environment this must be set to your system time zone.
-TIME_ZONE = 'America/Chicago'
+TIME_ZONE = 'Europe/Paris'
 
 # Language code for this installation. All choices can be found here:
 # http://www.i18nguy.com/unicode/language-identifiers.html