Merge branch 'master' of git@github.com:fnp/wolnelektury

[wolnelektury.git] / wolnelektury / settings.py

diff --git a/wolnelektury/settings.py b/wolnelektury/settings.py
index 8617992..359f08f 100644 (file)
--- a/wolnelektury/settings.py
+++ b/wolnelektury/settings.py
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-

 # Django settings for wolnelektury project.
 from os import path
 
 # Django settings for wolnelektury project.
 from os import path
 


@@ -33,15 +34,16 @@ LANGUAGE_CODE = 'pl'
 
 gettext = lambda s: s
 
 
 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('Spanish')),        
-)
+LANGUAGES = tuple(sorted([
+    ('pl', u'polski'),
+    ('de', u'Deutsch'),
+    ('en', u'English'),
+    ('lt', u'lietuvių'),
+    ('fr', u'français'),
+    ('ru', u'русский'),
+    ('es', u'español'),
+    #('uk', u'українська'),
+], key=lambda x: x[0]))

 
 
 SITE_ID = 1
 
 
 SITE_ID = 1


@@ -122,11 +124,14 @@ INSTALLED_APPS = [
     'pagination',
     'chunks',
     'compress',
     'pagination',
     'chunks',
     'compress',

+    'modeltranslation',

     'catalogue',
     'lessons',
     'piston',
     'api',
     'rosetta',
     'catalogue',
     'lessons',
     'piston',
     'api',
     'rosetta',

+    'infopages',
+    'suggest',

 ]
 
 CACHE_BACKEND = 'locmem:///?max_entries=3000'
 ]
 
 CACHE_BACKEND = 'locmem:///?max_entries=3000'


@@ -134,7 +139,7 @@ CACHE_BACKEND = 'locmem:///?max_entries=3000'
 # CSS and JavaScript file groups
 COMPRESS_CSS = {
     'all': {
 # CSS and JavaScript file groups
 COMPRESS_CSS = {
     'all': {

-        'source_filenames': ('css/master.css', 'css/jquery.autocomplete.css', 'css/jquery.countdown.css', 'css/master.plain.css', 'css/sponsors.css',),
+        'source_filenames': ('css/master.css', 'css/jquery.autocomplete.css', 'css/jquery.countdown.css', 'css/master.plain.css', 'css/sponsors.css', 'css/facelist_2-0.css',),

         'output_filename': 'css/all.min?.css',
     },
     'book': {
         'output_filename': 'css/all.min?.css',
     },
     'book': {


@@ -149,13 +154,14 @@ COMPRESS_JS = {
         'output_filename': 'js/jquery.min.js',
     },
     'all': {
         'output_filename': 'js/jquery.min.js',
     },
     'all': {

-        'source_filenames': ('js/jquery.autocomplete.js', 'js/jquery.form.js', 
-            'js/jquery.countdown.js', 'js/jquery.countdown-pl.js', 
-            'js/jquery.countdown-de.js',
+        'source_filenames': ('js/jquery.autocomplete.js', 'js/jquery.form.js',
+            'js/jquery.countdown.js', 'js/jquery.countdown-pl.js',
+            'js/jquery.countdown-de.js', 'js/jquery.countdown-uk.js',

             'js/jquery.countdown-es.js', 'js/jquery.countdown-lt.js',
             'js/jquery.countdown-ru.js', 'js/jquery.countdown-fr.js',
             'js/jquery.countdown-es.js', 'js/jquery.countdown-lt.js',
             'js/jquery.countdown-ru.js', 'js/jquery.countdown-fr.js',

+            'js/jquery.marquee.js',

             'js/jquery.jqmodal.js', 'js/jquery.labelify.js', 'js/catalogue.js',
             'js/jquery.jqmodal.js', 'js/jquery.labelify.js', 'js/catalogue.js',

-            'js/jquery.cookie.js',),
+            ),

         'output_filename': 'js/all?.min.js',
     },
     'book': {
         'output_filename': 'js/all?.min.js',
     },
     'book': {


@@ -180,6 +186,11 @@ THUMBNAIL_PROCESSORS = (
     'sponsors.processors.add_padding',
 )
 
     'sponsors.processors.add_padding',
 )
 

+TRANSLATION_REGISTRY = "wolnelektury.translation"
+
+# limit number of filtering tags
+MAX_TAG_LIST = 6
+

 # Load localsettings, if they exist
 try:
     from localsettings import *
 # Load localsettings, if they exist
 try:
     from localsettings import *