X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/73ce961f14509aabfa26536f847afd28111029c6..5d3f4483d48655682297aa3c945c997633ea45d2:/wolnelektury/settings.py

diff --git a/wolnelektury/settings.py b/wolnelektury/settings.py
index a69b0508e..18922b964 100644
--- a/wolnelektury/settings.py
+++ b/wolnelektury/settings.py
@@ -21,10 +21,10 @@ DATABASES = {
         'USER': '',                      # Not used with sqlite3.
         'PASSWORD': '',                  # Not used with sqlite3.
         'HOST': '',                      # Set to empty string for localhost. Not used with sqlite3.
-        'PORT': '',                      # Set to empty string for default. Not used with sqlite3.
     }
 }
 
+
 # Local time zone for this installation. Choices can be found here:
 # http://en.wikipedia.org/wiki/List_of_tz_zones_by_name
 # although not all choices may be available on all operating systems.
@@ -47,6 +47,8 @@ LANGUAGES = tuple(sorted([
     ('ru', u'русский'),
     ('es', u'español'),
     ('uk', u'українська'),
+    ('jp', u'日本語'),
+    ('it', u'italiano'),
 ], key=lambda x: x[0]))
 
 
@@ -156,6 +158,7 @@ INSTALLED_APPS = [
     'suggest',
     'picture',
     'search',
+    'social',
 ]
 
 CACHES = {
@@ -165,6 +168,13 @@ CACHES = {
             '127.0.0.1:11211',
         ]
     },
+    'permanent': {
+        'BACKEND': 'django.core.cache.backends.memcached.MemcachedCache',
+        'TIMEOUT': 2419200,
+        'LOCATION': [
+            '127.0.0.1:11211',
+        ]
+    },
     'api': {
         'BACKEND': 'django.core.cache.backends.filebased.FileBasedCache',
         'LOCATION': path.join(PROJECT_DIR, 'django_cache/'),
@@ -182,6 +192,7 @@ COMPRESS_CSS = {
             'css/jquery.countdown.css', 
 
             'css/base.css',
+            'css/cite.css',
             'css/header.css',
             'css/main_page.css',
             'css/dialogs.css',
@@ -189,13 +200,24 @@ COMPRESS_CSS = {
             'css/book_box.css',
             'css/catalogue.css',
             'css/sponsors.css',
-            
+            'css/logo.css',
+
+            'css/social/shelf_tags.css',
             'css/ui-lightness/jquery-ui-1.8.16.custom.css',
         ],
         'output_filename': 'css/all.min?.css',
     },
+    'ie': {
+        'source_filenames': [
+            'css/ie.css',
+        ],
+        'output_filename': 'css/ie.min?.css',
+    },
     'book': {
-        'source_filenames': ('css/master.book.css',),
+        'source_filenames': [
+            'css/logo.css',
+            'css/master.book.css',
+        ],
         'output_filename': 'css/book.min?.css',
     },
     'player': {
@@ -230,8 +252,6 @@ COMPRESS_JS = {
             'js/pdcounter.js',
 
             'js/search.js',
-
-            'js/jquery.labelify.js',
             ),
         'output_filename': 'js/base?.min.js',
     },
@@ -304,7 +324,7 @@ BROKER_USER = "guest"
 BROKER_PASSWORD = "guest"
 BROKER_VHOST = "/"
 
-
+CELERY_EAGER_PROPAGATES_EXCEPTIONS = True
 
 # Load localsettings, if they exist
 try: