switch thumbnail system from homegrown to sorl-thumbnail

[panikweb.git] / panikweb / settings.py

diff --git a/panikweb/settings.py b/panikweb/settings.py
index d4710e8c618f6ed6951693a22921061747a024ca..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
@@ -106,6 +107,7 @@ MIDDLEWARE_CLASSES = (
     'django.middleware.cache.UpdateCacheMiddleware',
     #'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',
@@ -143,6 +145,7 @@ INSTALLED_APPS = (
     'panikweb.paniktags',
     'mptt',
     'compressor',
+    'sorl.thumbnail',
     'jquery',
     'ckeditor',
     'emissions',
@@ -150,6 +153,7 @@ INSTALLED_APPS = (
     'nonstop',
     'combo.data',
     'combo.public',
+    'panikombo',
 )
 
 CKEDITOR_UPLOAD_PATH = os.path.join(MEDIA_ROOT, 'uploads')
@@ -226,7 +230,7 @@ COMBO_PUBLIC_TEMPLATES = {
     },
 }
 
-
+LANGUAGE_COOKIE_NAME = 'panikweb_language'
 
 try:
     from local_settings import *