fnp
/
wolnelektury.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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
62a2c9e
..
359f08f
100644
(file)
--- a/
wolnelektury/settings.py
+++ b/
wolnelektury/settings.py
@@
-1,10
+1,12
@@
+# -*- coding: utf-8 -*-
# Django settings for wolnelektury project.
from os import path
PROJECT_DIR = path.abspath(path.dirname(__file__))
# Django settings for wolnelektury project.
from os import path
PROJECT_DIR = path.abspath(path.dirname(__file__))
-DEBUG =
Tru
e
+DEBUG =
Fals
e
TEMPLATE_DEBUG = DEBUG
TEMPLATE_DEBUG = DEBUG
+MAINTENANCE_MODE = False
ADMINS = [
# ('Your Name', 'your_email@domain.com'),
ADMINS = [
# ('Your Name', 'your_email@domain.com'),
@@
-30,6
+32,20
@@
TIME_ZONE = 'Europe/Warsaw Poland'
# http://www.i18nguy.com/unicode/language-identifiers.html
LANGUAGE_CODE = 'pl'
# http://www.i18nguy.com/unicode/language-identifiers.html
LANGUAGE_CODE = 'pl'
+gettext = lambda s: s
+
+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
# If you set this to False, Django will make some optimizations so as not
SITE_ID = 1
# If you set this to False, Django will make some optimizations so as not
@@
-67,6
+83,7
@@
TEMPLATE_CONTEXT_PROCESSORS = [
'django.core.context_processors.i18n',
'django.core.context_processors.media',
'django.core.context_processors.request',
'django.core.context_processors.i18n',
'django.core.context_processors.media',
'django.core.context_processors.request',
+ 'wolnelektury.context_processors.extra_settings',
]
MIDDLEWARE_CLASSES = [
]
MIDDLEWARE_CLASSES = [
@@
-76,6
+93,8
@@
MIDDLEWARE_CLASSES = [
'django.middleware.doc.XViewMiddleware',
'pagination.middleware.PaginationMiddleware',
'django.middleware.locale.LocaleMiddleware',
'django.middleware.doc.XViewMiddleware',
'pagination.middleware.PaginationMiddleware',
'django.middleware.locale.LocaleMiddleware',
+
+ 'maintenancemode.middleware.MaintenanceModeMiddleware',
]
ROOT_URLCONF = 'wolnelektury.urls'
]
ROOT_URLCONF = 'wolnelektury.urls'
@@
-96,7
+115,7
@@
INSTALLED_APPS = [
'django.contrib.sites',
'django.contrib.admin',
'django.contrib.admindocs',
'django.contrib.sites',
'django.contrib.admin',
'django.contrib.admindocs',
-
+
# external
'south',
'sorl.thumbnail',
# external
'south',
'sorl.thumbnail',
@@
-105,10
+124,14
@@
INSTALLED_APPS = [
'pagination',
'chunks',
'compress',
'pagination',
'chunks',
'compress',
+ 'modeltranslation',
'catalogue',
'lessons',
'piston',
'api',
'catalogue',
'lessons',
'piston',
'api',
+ 'rosetta',
+ 'infopages',
+ 'suggest',
]
CACHE_BACKEND = 'locmem:///?max_entries=3000'
]
CACHE_BACKEND = 'locmem:///?max_entries=3000'
@@
-116,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': {
@@
-131,10
+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',
+ 'source_filenames': ('js/jquery.autocomplete.js', 'js/jquery.form.js',
'js/jquery.countdown.js', 'js/jquery.countdown-pl.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.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': {
@@
-159,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 *