update translation

[redakcja.git] / redakcja / settings / common.py

diff --git a/redakcja/settings/common.py b/redakcja/settings/common.py
index 1e16bb1..c32b6ad 100644 (file)
--- a/redakcja/settings/common.py
+++ b/redakcja/settings/common.py
@@ -24,10 +24,10 @@ 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

-LANGUAGE_CODE = 'pl'
+LANGUAGE_CODE = 'en'

 
 

-#import locale
-#locale.setlocale(locale.LC_ALL, '')
+# import locale
+# locale.setlocale(locale.LC_ALL, '')

 
 SITE_ID = 1
 
 
 SITE_ID = 1
 


@@ -35,12 +35,23 @@ SITE_ID = 1
 # to load the internationalization machinery.
 USE_I18N = True
 USE_L10N = True
 # to load the internationalization machinery.
 USE_I18N = True
 USE_L10N = True

-
+LANGUAGES = [
+    ('en', 'English'),
+    ('pl', 'polski'),
+]

 
 # Absolute path to the directory that holds media.
 # Example: "/home/media/media.lawrence.com/"
 MEDIA_ROOT = PROJECT_ROOT + '/media/dynamic'
 
 # Absolute path to the directory that holds media.
 # Example: "/home/media/media.lawrence.com/"
 MEDIA_ROOT = PROJECT_ROOT + '/media/dynamic'

-STATIC_ROOT = PROJECT_ROOT + '/static/'
+STATIC_ROOT = PROJECT_ROOT + '/../static/'
+
+STATICFILES_DIRS = [
+    PROJECT_ROOT + '/static/'
+]
+
+LOCALE_PATHS = [
+    PROJECT_ROOT + '/locale/',
+]

 
 # URL that handles the media served from MEDIA_ROOT. Make sure to use a
 # trailing slash if there is a path component (optional in other cases).
 
 # URL that handles the media served from MEDIA_ROOT. Make sure to use a
 # trailing slash if there is a path component (optional in other cases).


@@ -48,13 +59,6 @@ STATIC_ROOT = PROJECT_ROOT + '/static/'
 MEDIA_URL = '/media/dynamic/'
 STATIC_URL = '/media/static/'
 
 MEDIA_URL = '/media/dynamic/'
 STATIC_URL = '/media/static/'
 

-# URL prefix for admin media -- CSS, JavaScript and images. Make sure to use a
-# trailing slash.
-# Examples: "http://foo.com/media/", "/media/".
-ADMIN_MEDIA_PREFIX = '/media/admin-media/'
-
-# Make this unique, and don't share it with anybody.
-SECRET_KEY = 'ife@x^_lak+x84=lxtr!-ur$5g$+s6xt85gbbm@e_fk6q3r8=+'

 SESSION_COOKIE_NAME = "redakcja_sessionid"
 
 # List of callables that know how to import templates from various sources.
 SESSION_COOKIE_NAME = "redakcja_sessionid"
 
 # List of callables that know how to import templates from various sources.


@@ -67,7 +71,7 @@ TEMPLATE_CONTEXT_PROCESSORS = (
     "django.contrib.auth.context_processors.auth",
     "django.core.context_processors.debug",
     "django.core.context_processors.i18n",
     "django.contrib.auth.context_processors.auth",
     "django.core.context_processors.debug",
     "django.core.context_processors.i18n",

-    "redakcja.context_processors.settings", # this is instead of media
+    "redakcja.context_processors.settings",  # this is instead of media

     'django.core.context_processors.csrf',
     "django.core.context_processors.request",
 )
     'django.core.context_processors.csrf',
     "django.core.context_processors.request",
 )


@@ -77,19 +81,22 @@ MIDDLEWARE_CLASSES = (
     'django.middleware.common.CommonMiddleware',
     'django.middleware.csrf.CsrfViewMiddleware',
     'django.contrib.sessions.middleware.SessionMiddleware',
     'django.middleware.common.CommonMiddleware',
     'django.middleware.csrf.CsrfViewMiddleware',
     'django.contrib.sessions.middleware.SessionMiddleware',

+    'django.contrib.messages.middleware.MessageMiddleware',
+    'django.middleware.locale.LocaleMiddleware',

 
     'django.contrib.auth.middleware.AuthenticationMiddleware',
 
     'django.contrib.auth.middleware.AuthenticationMiddleware',

-    'django_cas.middleware.CASMiddleware',
+    # 'django_cas.middleware.CASMiddleware',

 
 

-    'django.middleware.doc.XViewMiddleware',
+    'django.contrib.admindocs.middleware.XViewMiddleware',

     'pagination.middleware.PaginationMiddleware',
     'pagination.middleware.PaginationMiddleware',

-    'maintenancemode.middleware.MaintenanceModeMiddleware',
+    # 'maintenancemode.middleware.MaintenanceModeMiddleware',
+    'django.contrib.flatpages.middleware.FlatpageFallbackMiddleware',

 )
 
 )
 

-AUTHENTICATION_BACKENDS = (
-    'django.contrib.auth.backends.ModelBackend',
-    'django_cas.backends.CASBackend',
-)
+# AUTHENTICATION_BACKENDS = (
+#     'django.contrib.auth.backends.ModelBackend',
+#     'fnpdjango.auth_backends.AttrCASBackend',
+# )

 
 ROOT_URLCONF = 'redakcja.urls'
 
 
 ROOT_URLCONF = 'redakcja.urls'
 


@@ -103,46 +110,51 @@ INSTALLED_APPS = (
     'django.contrib.auth',
     'django.contrib.contenttypes',
     'django.contrib.sessions',
     'django.contrib.auth',
     'django.contrib.contenttypes',
     'django.contrib.sessions',

+    'django.contrib.messages',
+    'django.contrib.staticfiles',

     'django.contrib.sites',
     'django.contrib.admin',
     'django.contrib.admindocs',
     'django.contrib.sites',
     'django.contrib.admin',
     'django.contrib.admindocs',

-    'django.contrib.comments',
+    'django.contrib.flatpages',
+    # 'django.contrib.comments',

 
 

-    'compress',
-    'south',
+    # 'south',

     'sorl.thumbnail',
     'sorl.thumbnail',

-    'filebrowser',

     'pagination',
     'pagination',

-    'gravatar',
-    'djcelery',
-    'djkombu',
+    # 'gravatar',
+    # 'kombu.transport.django',
+    'fileupload',
+    'pipeline',
+    'modeltranslation',

 
     'catalogue',
 
     'catalogue',

+    # 'cover',

     'dvcs',
     'dvcs',

+    'organizations',

     'wiki',
     'wiki',

-    'toolbar',
-    'apiclient',
+    # 'toolbar',
+    # 'apiclient',

     'email_mangler',
     'email_mangler',

-)
-
-LOGIN_REDIRECT_URL = '/documents/user'
+    'build',
+    'attachments',

 
 

-CAS_USER_ATTRS_MAP = {
-    'email': 'email', 'firstname': 'first_name', 'lastname': 'last_name'}
+    'django_forms_bootstrap',
+    'forms_builder.forms',
+    'fnpdjango',
+)

 
 

+LOGIN_REDIRECT_URL = '/'

 
 

-FILEBROWSER_URL_FILEBROWSER_MEDIA = STATIC_URL + 'filebrowser/'
-FILEBROWSER_DIRECTORY = 'images/'
-FILEBROWSER_ADMIN_VERSIONS = []
-FILEBROWSER_VERSIONS_BASEDIR = 'thumbnails/'
-FILEBROWSER_DEFAULT_ORDER = "path_relative"
+# CAS_USER_ATTRS_MAP = {
+#     'email': 'email', 'firstname': 'first_name', 'lastname': 'last_name'}

 
 # REPOSITORY_PATH = '/Users/zuber/Projekty/platforma/files/books'
 
 # REPOSITORY_PATH = '/Users/zuber/Projekty/platforma/files/books'

-IMAGE_DIR = 'images'
+
+IMAGE_DIR = 'images/'

 
 
 
 

-import djcelery
-djcelery.setup_loader()
+# import djcelery
+# djcelery.setup_loader()

 
 BROKER_BACKEND = "djkombu.transport.DatabaseTransport"
 BROKER_HOST = "localhost"
 
 BROKER_BACKEND = "djkombu.transport.DatabaseTransport"
 BROKER_HOST = "localhost"


@@ -153,8 +165,12 @@ BROKER_VHOST = "/"
 
 SHOW_APP_VERSION = False
 
 
 SHOW_APP_VERSION = False
 

+
+FORMS_BUILDER_EDITABLE_SLUGS = True
+FORMS_BUILDER_LABEL_MAX_LENGTH = 2048
+
+

 try:
     from redakcja.settings.compress import *
 except ImportError:
     pass
 try:
     from redakcja.settings.compress import *
 except ImportError:
     pass

-