Missing .js (compress error) fix.

[wolnelektury.git] / wolnelektury / settings.py

diff --git a/wolnelektury/settings.py b/wolnelektury/settings.py
index 98fd963..ff979a6 100644 (file)
--- a/wolnelektury/settings.py
+++ b/wolnelektury/settings.py
@@ -30,6 +30,19 @@ TIME_ZONE = 'Europe/Warsaw Poland'
 # http://www.i18nguy.com/unicode/language-identifiers.html
 LANGUAGE_CODE = 'pl'
 
+gettext = lambda s: s
+
+LANGUAGES = (
+    ('de', gettext('German')),
+    ('en', gettext('English')),
+    ('pl', gettext('Polish')),
+    ('lt', gettext('Lithuanian')),
+    ('fr', gettext('French')),
+    ('ru', gettext('Russian')),
+    ('es', gettext('Spain')),        
+)
+
+
 SITE_ID = 1
 
 # If you set this to False, Django will make some optimizations so as not
@@ -67,6 +80,7 @@ TEMPLATE_CONTEXT_PROCESSORS = [
     'django.core.context_processors.i18n',
     'django.core.context_processors.media',
     'django.core.context_processors.request',
+    'wolnelektury.context_processors.extra_settings',
 ]
 
 MIDDLEWARE_CLASSES = [
@@ -75,6 +89,7 @@ MIDDLEWARE_CLASSES = [
     'django.contrib.auth.middleware.AuthenticationMiddleware',
     'django.middleware.doc.XViewMiddleware',
     'pagination.middleware.PaginationMiddleware',
+    'django.middleware.locale.LocaleMiddleware',
 ]
 
 ROOT_URLCONF = 'wolnelektury.urls'
@@ -95,7 +110,7 @@ INSTALLED_APPS = [
     'django.contrib.sites',
     'django.contrib.admin',
     'django.contrib.admindocs',
-    
+
     # external
     'south',
     'sorl.thumbnail',
@@ -106,6 +121,9 @@ INSTALLED_APPS = [
     'compress',
     'catalogue',
     'lessons',
+    'piston',
+    'api',
+    'rosetta',
 ]
 
 CACHE_BACKEND = 'locmem:///?max_entries=3000'
@@ -113,12 +131,12 @@ CACHE_BACKEND = 'locmem:///?max_entries=3000'
 # CSS and JavaScript file groups
 COMPRESS_CSS = {
     'all': {
-        'source_filenames': ('css/master.css', 'css/jquery.autocomplete.css', 'css/master.plain.css', 'css/sponsors.css',),
-        'output_filename': 'css/all.min.css',
+        'source_filenames': ('css/master.css', 'css/jquery.autocomplete.css', 'css/jquery.countdown.css', 'css/master.plain.css', 'css/sponsors.css',),
+        'output_filename': 'css/all.min?.css',
     },
     'book': {
         'source_filenames': ('css/master.book.css',),
-        'output_filename': 'css/book.min.css',
+        'output_filename': 'css/book.min?.css',
     }
 }
 
@@ -129,15 +147,21 @@ COMPRESS_JS = {
     },
     'all': {
         'source_filenames': ('js/jquery.autocomplete.js', 'js/jquery.form.js', 
-            'js/jquery.jqmodal.js', 'js/jquery.labelify.js', 'js/catalogue.js',),
-        'output_filename': 'js/all.min.js',
+            'js/jquery.countdown.js', 'js/jquery.countdown-pl.js', 
+            'js/jquery.countdown-de.js',
+            'js/jquery.countdown-es.js', 'js/jquery.countdown-lt.js',
+            'js/jquery.countdown-ru.js', 'js/jquery.countdown-fr.js',
+            'js/jquery.jqmodal.js', 'js/jquery.labelify.js', 'js/catalogue.js',
+            'js/jquery.cookie.js',),
+        'output_filename': 'js/all?.min.js',
     },
     'book': {
         'source_filenames': ('js/jquery.eventdelegation.js', 'js/jquery.scrollto.js', 'js/jquery.highlightfade.js', 'js/book.js',),
-        'output_filename': 'js/book.min.js',
+        'output_filename': 'js/book?.min.js',
     }
 }
 
+COMPRESS_VERSION = True
 COMPRESS_CSS_FILTERS = None
 
 THUMBNAIL_QUALITY = 95