french infopage coding fixup

[wolnelektury.git] / wolnelektury / settings.py

diff --git a/wolnelektury/settings.py b/wolnelektury/settings.py
index f93f9e8..a1ad878 100644 (file)
--- 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.
         '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.
 # 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'українська'),
     ('ru', u'русский'),
     ('es', u'español'),
     ('uk', u'українська'),

+    ('jp', u'日本語'),
+    ('it', u'italiano'),

 ], key=lambda x: x[0]))
 
 
 ], key=lambda x: x[0]))
 
 


@@ -190,6 +192,7 @@ COMPRESS_CSS = {
             'css/jquery.countdown.css', 
 
             'css/base.css',
             'css/jquery.countdown.css', 
 
             'css/base.css',

+            'css/cite.css',

             'css/header.css',
             'css/main_page.css',
             'css/dialogs.css',
             'css/header.css',
             'css/main_page.css',
             'css/dialogs.css',


@@ -197,18 +200,30 @@ COMPRESS_CSS = {
             'css/book_box.css',
             'css/catalogue.css',
             'css/sponsors.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',
     },
             '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': {
     'book': {

-        'source_filenames': ('css/master.book.css',),
+        'source_filenames': [
+            'css/logo.css',
+            'css/master.book.css',
+        ],

         'output_filename': 'css/book.min?.css',
     },
     'player': {
         'source_filenames': [
             'jplayer/jplayer.blue.monday.css', 
         'output_filename': 'css/book.min?.css',
     },
     'player': {
         'source_filenames': [
             'jplayer/jplayer.blue.monday.css', 

+            'css/player.css', 

         ],
         'output_filename': 'css/player.min?.css',
     },
         ],
         'output_filename': 'css/player.min?.css',
     },


@@ -238,8 +253,6 @@ COMPRESS_JS = {
             'js/pdcounter.js',
 
             'js/search.js',
             'js/pdcounter.js',
 
             'js/search.js',

-
-            'js/jquery.labelify.js',

             ),
         'output_filename': 'js/base?.min.js',
     },
             ),
         'output_filename': 'js/base?.min.js',
     },


@@ -312,7 +325,7 @@ BROKER_USER = "guest"
 BROKER_PASSWORD = "guest"
 BROKER_VHOST = "/"
 
 BROKER_PASSWORD = "guest"
 BROKER_VHOST = "/"
 

-
+CELERY_EAGER_PROPAGATES_EXCEPTIONS = True

 
 # Load localsettings, if they exist
 try:
 
 # Load localsettings, if they exist
 try: