switch thumbnail system from homegrown to sorl-thumbnail

[panikweb.git] / panikweb / settings.py

diff --git a/panikweb/settings.py b/panikweb/settings.py
index 1d3a5b92585f1827bb804e380b817b78b8291595..2e72faa735b15ba42fd3a820bcdaa8e99b22cf65 100644 (file)
--- a/panikweb/settings.py
+++ b/panikweb/settings.py
@@ -47,6 +47,7 @@ LANGUAGE_CODE = 'fr-be'
 
 LANGUAGES = (
   ('fr', u'Français'),
+  ('en', u'English'),
 )
 
 SITE_ID = 1
@@ -104,14 +105,13 @@ TEMPLATE_LOADERS = (
 
 MIDDLEWARE_CLASSES = (
     'django.middleware.cache.UpdateCacheMiddleware',
-    'django.middleware.gzip.GZipMiddleware',
+    #'django.middleware.gzip.GZipMiddleware',
     'django.contrib.sessions.middleware.SessionMiddleware',
+    'django.middleware.locale.LocaleMiddleware',
     'django.middleware.common.CommonMiddleware',
     'django.middleware.csrf.CsrfViewMiddleware',
     'django.contrib.auth.middleware.AuthenticationMiddleware',
     'django.contrib.messages.middleware.MessageMiddleware',
-    'fiber.middleware.ObfuscateEmailAddressMiddleware',
-    'fiber.middleware.AdminPageMiddleware',
     #'request.middleware.RequestMiddleware',
     'panikweb.middleware.StripPiwikCookieMiddleware',
     'django.middleware.cache.FetchFromCacheMiddleware',
@@ -139,18 +139,21 @@ INSTALLED_APPS = (
     'django.contrib.staticfiles',
     'django.contrib.admin',
     'django.contrib.admindocs',
-    'south',
     'haystack',
     'taggit',
     'panikweb_templates',
     'panikweb.paniktags',
     'mptt',
     'compressor',
-    'fiber',
+    'sorl.thumbnail',
     'jquery',
     'ckeditor',
     'emissions',
     'newsletter',
+    'nonstop',
+    'combo.data',
+    'combo.public',
+    'panikombo',
 )
 
 CKEDITOR_UPLOAD_PATH = os.path.join(MEDIA_ROOT, 'uploads')
@@ -215,6 +218,20 @@ DEBUG_TOOLBAR_PANELS = (
     'debug_toolbar.panels.logger.LoggingPanel',
 )
 
+COMBO_PUBLIC_TEMPLATES = {
+    'standard': {
+        'name': 'Standard',
+        'template': 'combo/page_template.html',
+        'placeholders': {
+            'content': {
+                'name': 'Content',
+            },
+        }
+    },
+}
+
+LANGUAGE_COOKIE_NAME = 'panikweb_language'
+
 try:
     from local_settings import *
 except ImportError, e: