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 8a82221..a50763d 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
 


@@ -13,19 +14,23 @@ ADMINS = [
 
 MANAGERS = ADMINS
 
 
 MANAGERS = ADMINS
 

-DATABASE_ENGINE = 'sqlite3'    # 'postgresql_psycopg2', 'postgresql', 'mysql', 'sqlite3' or 'oracle'.
-DATABASE_NAME = path.join(PROJECT_DIR, 'dev.db')  # Or path to database file if using sqlite3.
-DATABASE_USER = ''             # Not used with sqlite3.
-DATABASE_PASSWORD = ''         # Not used with sqlite3.
-DATABASE_HOST = ''             # Set to empty string for localhost. Not used with sqlite3.
-DATABASE_PORT = ''             # Set to empty string for default. Not used with sqlite3.
+DATABASES = {
+    'default': {
+        'ENGINE': 'django.db.backends.sqlite3', # Add 'postgresql_psycopg2', 'postgresql', 'mysql', 'sqlite3' or 'oracle'.
+        'NAME': path.join(PROJECT_DIR, 'dev.db'), # Or path to database file if using 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.
 # If running in a Windows environment this must be set to the same as your
 # system time zone.
 
 # 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.
 # If running in a Windows environment this must be set to the same as your
 # system time zone.

-TIME_ZONE = 'Europe/Warsaw Poland'
+TIME_ZONE = 'Europe/Warsaw'

 
 # Language code for this installation. All choices can be found here:
 # http://www.i18nguy.com/unicode/language-identifiers.html
 
 # Language code for this installation. All choices can be found here:
 # http://www.i18nguy.com/unicode/language-identifiers.html


@@ -34,14 +39,14 @@ LANGUAGE_CODE = 'pl'
 gettext = lambda s: s
 
 LANGUAGES = tuple(sorted([
 gettext = lambda s: s
 
 LANGUAGES = tuple(sorted([

-    ('pl', gettext('Polish')),
-    ('de', gettext('German')),
-    ('en', gettext('English')),
-    ('lt', gettext('Lithuanian')),
-    ('fr', gettext('French')),
-    ('ru', gettext('Russian')),
-    ('es', gettext('Spanish')),
-    ('uk', gettext('Ukrainian')),
+    ('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]))
 
 
 ], key=lambda x: x[0]))
 
 


@@ -131,6 +136,9 @@ INSTALLED_APPS = [
     'rosetta',
     'infopages',
     'suggest',
     'rosetta',
     'infopages',
     'suggest',

+    'lesmianator',
+    'opds',
+    'pdcounter',

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


@@ -158,6 +166,7 @@ COMPRESS_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-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.cycle.min.js',

             'js/jquery.jqmodal.js', 'js/jquery.labelify.js', 'js/catalogue.js',
             ),
         'output_filename': 'js/all?.min.js',
             'js/jquery.jqmodal.js', 'js/jquery.labelify.js', 'js/catalogue.js',
             ),
         'output_filename': 'js/all?.min.js',


@@ -189,6 +198,9 @@ TRANSLATION_REGISTRY = "wolnelektury.translation"
 # limit number of filtering tags
 MAX_TAG_LIST = 6
 
 # limit number of filtering tags
 MAX_TAG_LIST = 6
 

+NO_BUILD_EPUB = False
+NO_BUILD_TXT = False
+

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