Change *.conf to *.py, so that Django tools see it as code.
Minor fixes.
-*/settings.d/local.conf
+*/settings.d/local.py
dev.sqlite
*.db
*.db-journal
msgstr ""
"Project-Id-Version: prawokultury\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-30 11:15+0200\n"
-"PO-Revision-Date: 2012-08-30 11:15+0100\n"
+"POT-Creation-Date: 2012-11-12 10:10+0100\n"
+"PO-Revision-Date: 2012-11-12 10:11+0100\n"
"Last-Translator: Radek Czajka <radoslaw.czajka@nowoczesnapolska.org.pl>\n"
"Language-Team: FNP <fundacja@nowoczesnapolska.org.pl>\n"
"Language: \n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
-#: urls.py:23
+#: menu_items.py:21
+msgid "Publications"
+msgstr "Publikacje"
+
+#: menu_items.py:23
+msgid "Events"
+msgstr "Wydarzenia"
+
+#: menu_items.py:27
+msgid "Positions"
+msgstr "Stanowiska"
+
+#: urls.py:31
msgid "events"
msgstr "wydarzenia"
-#: templates/404.html:5
-msgid "Page not found."
-msgstr "Strona nie znaleziona."
+#: settings.d/60-custom.py:5
+msgid "news"
+msgstr "newsy"
+
+#: settings.d/60-custom.py:7
+msgid "publications"
+msgstr "publikacje"
+
+#: settings.d/60-custom.py:8
+msgid "info"
+msgstr "info"
-#: templates/404.html:10
+#: templates/404.html:5
+#: templates/404.html.py:10
msgid "Page not found"
msgstr "Strona nie znaleziona"
#: templates/base.html.py:13
#: templates/base.html:14
#: templates/base.html.py:25
-#: templates/base.html:73
+#: templates/base.html:74
msgid "Culture's right"
msgstr "Prawo kultury"
msgid "Search"
msgstr "Szukaj"
-#: templates/base.html:62
+#: templates/base.html:63
msgid "Upcoming events"
msgstr "Nadchodzące wydarzenia"
-#: templates/base.html:77
+#: templates/base.html:78
msgid "Latest comments"
msgstr "Ostatnie komentarze"
-#: templates/base.html:105
+#: templates/base.html:106
msgid "If not explicitly stated otherwise, all texts are licensed under the <a href='http://creativecommons.org/licenses/by-sa/3.0/'>Creative Commons Attribution-Share Alike</a> free license."
msgstr "Jeśli nie oznaczono inaczej, wszystkie teksty są objęte wolną licencją <a href='http://creativecommons.org/licenses/by-sa/3.0/deed.pl'>Creative Commons Uznanie autorstwa – Na tych samych warunkach</a>."
-#: templates/share.html:5
-#: templates/share.html.py:7
-msgid "Share on Facebook"
-msgstr "Podziel się na Facebooku"
+#~ msgid "Page not found."
+#~ msgstr "Strona nie znaleziona."
+
+#~ msgid "Share on Facebook"
+#~ msgstr "Podziel się na Facebooku"
-#: templates/share.html:10
-#: templates/share.html.py:12
-msgid "Share on Google+"
-msgstr "Podziel się na Google+"
+#~ msgid "Share on Google+"
+#~ msgstr "Podziel się na Google+"
-#: templates/share.html:15
-#: templates/share.html.py:17
-msgid "Share on Twitter"
-msgstr "Podziel się na Twitterze"
+#~ msgid "Share on Twitter"
+#~ msgstr "Podziel się na Twitterze"
-#: templates/share.html:20
-#: templates/share.html.py:22
-msgid "Share on NK.pl"
-msgstr "Podziel się na NK.pl"
+#~ msgid "Share on NK.pl"
+#~ msgstr "Podziel się na NK.pl"
-#: templates/prevnext/next.html:13
-msgid "next"
-msgstr "następne"
+#~ msgid "next"
+#~ msgstr "następne"
-#: templates/prevnext/previous.html:13
-msgid "previous"
-msgstr "poprzednie"
+#~ msgid "previous"
+#~ msgstr "poprzednie"
#~ msgid "About us"
#~ msgstr "O nas"
-#~ msgid "Publications"
-#~ msgstr "Publikacje"
-
-#~ msgid "Events"
-#~ msgstr "Wydarzenia"
-
-#~ msgid "Positions"
-#~ msgstr "Stanowiska"
-
#~ msgid "First aid"
#~ msgstr "Pierwsza pomoc"
+++ /dev/null
-from os import path
-
-PROJECT_DIR = path.dirname(path.abspath(path.dirname(__file__)))
--- /dev/null
+from os import path
+
+PROJECT_DIR = path.dirname(path.abspath(path.dirname(__file__)))
+++ /dev/null
-DEBUG = False
-TEMPLATE_DEBUG = DEBUG
-
-DATABASES = {
- 'default': {
- 'ENGINE': 'django.db.backends.sqlite3', # Add 'postgresql_psycopg2', '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.
- }
-}
-
-SITE_ID = 1
-
-# List of callables that know how to import templates from various sources.
-TEMPLATE_LOADERS = (
- 'django.template.loaders.filesystem.Loader',
- 'django.template.loaders.app_directories.Loader',
-# 'django.template.loaders.eggs.Loader',
-)
-
-ROOT_URLCONF = 'prawokultury.urls'
-
-# Python dotted path to the WSGI application used by Django's runserver.
-WSGI_APPLICATION = 'prawokultury.wsgi.application'
-
-TEMPLATE_DIRS = (
- # Put strings here, like "/home/html/django_templates" or "C:/www/django/templates".
- # Always use forward slashes, even on Windows.
- # Don't forget to use absolute paths, not relative paths.
-)
--- /dev/null
+DEBUG = False
+TEMPLATE_DEBUG = DEBUG
+
+DATABASES = {
+ 'default': {
+ 'ENGINE': 'django.db.backends.sqlite3', # Add 'postgresql_psycopg2', '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.
+ }
+}
+
+SITE_ID = 1
+
+# List of callables that know how to import templates from various sources.
+TEMPLATE_LOADERS = (
+ 'django.template.loaders.filesystem.Loader',
+ 'django.template.loaders.app_directories.Loader',
+# 'django.template.loaders.eggs.Loader',
+)
+
+ROOT_URLCONF = 'prawokultury.urls'
+
+# Python dotted path to the WSGI application used by Django's runserver.
+WSGI_APPLICATION = 'prawokultury.wsgi.application'
+
+TEMPLATE_DIRS = (
+ # Put strings here, like "/home/html/django_templates" or "C:/www/django/templates".
+ # Always use forward slashes, even on Windows.
+ # Don't forget to use absolute paths, not relative paths.
+)
+++ /dev/null
-INSTALLED_APPS = (
- 'prawokultury',
- 'fnpdjango',
- 'menu',
- 'events',
- 'migdal',
-
- 'gravatar',
- 'south',
- 'django.contrib.comments',
- 'django_comments_xtd',
- 'pipeline',
- 'haystack',
- 'pagination',
- 'sorl.thumbnail',
- 'piwik.django',
- 'django_cas',
-
- 'django.contrib.auth',
- 'django.contrib.contenttypes',
- 'django.contrib.sessions',
- 'django.contrib.sites',
- 'django.contrib.messages',
- 'django.contrib.staticfiles',
- 'django.contrib.admin',
- 'django.contrib.admindocs',
-)
--- /dev/null
+INSTALLED_APPS = (
+ 'prawokultury',
+ 'fnpdjango',
+ 'menu',
+ 'events',
+ 'migdal',
+
+ 'gravatar',
+ 'south',
+ 'django.contrib.comments',
+ 'django_comments_xtd',
+ 'pipeline',
+ 'haystack',
+ 'pagination',
+ 'sorl.thumbnail',
+ 'piwik.django',
+ 'django_cas',
+
+ 'django.contrib.auth',
+ 'django.contrib.contenttypes',
+ 'django.contrib.sessions',
+ 'django.contrib.sites',
+ 'django.contrib.messages',
+ 'django.contrib.staticfiles',
+ 'django.contrib.admin',
+ 'django.contrib.admindocs',
+)
+++ /dev/null
-# -*- coding: utf-8 -*-
-
-LANGUAGES = (
- ('pl', u'polski'),
- ('en', u'English'),
-)
-
-LOCALE_PATHS = [
- path.join(PROJECT_DIR, 'prawokultury/locale-contrib')
-]
-
-# 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.
-# On Unix systems, a value of None will cause Django to use the same
-# timezone as the operating system.
-# If running in a Windows environment this must be set to the same as your
-# system time zone.
-TIME_ZONE = None
-
-# Language code for this installation. All choices can be found here:
-# http://www.i18nguy.com/unicode/language-identifiers.html
-LANGUAGE_CODE = 'pl'
-
-# If you set this to False, Django will make some optimizations so as not
-# to load the internationalization machinery.
-USE_I18N = True
-
-# If you set this to False, Django will not format dates, numbers and
-# calendars according to the current locale.
-USE_L10N = True
-
-# If you set this to False, Django will not use timezone-aware datetimes.
-USE_TZ = True
-
-FORMAT_MODULE_PATH = "prawokultury.formats"
--- /dev/null
+# -*- coding: utf-8 -*-
+
+LANGUAGES = (
+ ('pl', u'polski'),
+ ('en', u'English'),
+)
+
+LOCALE_PATHS = [
+ path.join(PROJECT_DIR, 'prawokultury/locale-contrib')
+]
+
+# 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.
+# On Unix systems, a value of None will cause Django to use the same
+# timezone as the operating system.
+# If running in a Windows environment this must be set to the same as your
+# system time zone.
+TIME_ZONE = None
+
+# Language code for this installation. All choices can be found here:
+# http://www.i18nguy.com/unicode/language-identifiers.html
+LANGUAGE_CODE = 'pl'
+
+# If you set this to False, Django will make some optimizations so as not
+# to load the internationalization machinery.
+USE_I18N = True
+
+# If you set this to False, Django will not format dates, numbers and
+# calendars according to the current locale.
+USE_L10N = True
+
+# If you set this to False, Django will not use timezone-aware datetimes.
+USE_TZ = True
+
+FORMAT_MODULE_PATH = "prawokultury.formats"
+++ /dev/null
-HAYSTACK_CONNECTIONS = {
- 'default': {
- 'ENGINE': 'haystack.backends.solr_backend.SolrEngine',
- 'URL': 'http://127.0.0.1:8983/solr/prawokultury'
- },
-}
-
-HAYSTACK_DOCUMENT_FIELD = "body_%s" % LANGUAGE_CODE
--- /dev/null
+HAYSTACK_CONNECTIONS = {
+ 'default': {
+ 'ENGINE': 'haystack.backends.solr_backend.SolrEngine',
+ 'URL': 'http://127.0.0.1:8983/solr/prawokultury'
+ },
+}
+
+HAYSTACK_DOCUMENT_FIELD = "body_%s" % LANGUAGE_CODE
+++ /dev/null
-if 'django_cas' in INSTALLED_APPS:
- AUTHENTICATION_BACKENDS = (
- 'django.contrib.auth.backends.ModelBackend',
- 'django_cas.backends.CASBackend',
- )
--- /dev/null
+if 'django_cas' in INSTALLED_APPS:
+ AUTHENTICATION_BACKENDS = (
+ 'django.contrib.auth.backends.ModelBackend',
+ 'django_cas.backends.CASBackend',
+ )
+++ /dev/null
-TEMPLATE_CONTEXT_PROCESSORS = (
- "django.contrib.auth.context_processors.auth",
- "django.core.context_processors.debug",
- "django.core.context_processors.i18n",
- "django.core.context_processors.media",
- "django.core.context_processors.static",
- "django.core.context_processors.tz",
- "django.contrib.messages.context_processors.messages",
- 'django.core.context_processors.request',
-)
--- /dev/null
+TEMPLATE_CONTEXT_PROCESSORS = (
+ "django.contrib.auth.context_processors.auth",
+ "django.core.context_processors.debug",
+ "django.core.context_processors.i18n",
+ "django.core.context_processors.media",
+ "django.core.context_processors.static",
+ "django.core.context_processors.tz",
+ "django.contrib.messages.context_processors.messages",
+ 'django.core.context_processors.request',
+)
+++ /dev/null
-# A sample logging configuration. The only tangible logging
-# performed by this configuration is to send an email to
-# the site admins on every HTTP 500 error when DEBUG=False.
-# See http://docs.djangoproject.com/en/dev/topics/logging for
-# more details on how to customize your logging configuration.
-LOGGING = {
- 'version': 1,
- 'disable_existing_loggers': False,
- 'filters': {
- 'require_debug_false': {
- '()': 'django.utils.log.RequireDebugFalse'
- }
- },
- 'handlers': {
- 'mail_admins': {
- 'level': 'ERROR',
- 'filters': ['require_debug_false'],
- 'class': 'django.utils.log.AdminEmailHandler'
- }
- },
- 'loggers': {
- 'django.request': {
- 'handlers': ['mail_admins'],
- 'level': 'ERROR',
- 'propagate': True,
- },
- }
-}
--- /dev/null
+# A sample logging configuration. The only tangible logging
+# performed by this configuration is to send an email to
+# the site admins on every HTTP 500 error when DEBUG=False.
+# See http://docs.djangoproject.com/en/dev/topics/logging for
+# more details on how to customize your logging configuration.
+LOGGING = {
+ 'version': 1,
+ 'disable_existing_loggers': False,
+ 'filters': {
+ 'require_debug_false': {
+ '()': 'django.utils.log.RequireDebugFalse'
+ }
+ },
+ 'handlers': {
+ 'mail_admins': {
+ 'level': 'ERROR',
+ 'filters': ['require_debug_false'],
+ 'class': 'django.utils.log.AdminEmailHandler'
+ }
+ },
+ 'loggers': {
+ 'django.request': {
+ 'handlers': ['mail_admins'],
+ 'level': 'ERROR',
+ 'propagate': True,
+ },
+ }
+}
+++ /dev/null
-MIDDLEWARE_CLASSES = (
- 'django.contrib.sessions.middleware.SessionMiddleware',
- #'django.middleware.locale.LocaleMiddleware',
- 'fnpdjango.middleware.URLLocaleMiddleware',
-
- 'django.middleware.common.CommonMiddleware',
- 'django.middleware.csrf.CsrfViewMiddleware',
- 'django.contrib.auth.middleware.AuthenticationMiddleware',
-)
-
-if 'django_cas' in INSTALLED_APPS:
- MIDDLEWARE_CLASSES += (
- 'django_cas.middleware.CASMiddleware',
- )
-
-MIDDLEWARE_CLASSES += (
- 'django.contrib.messages.middleware.MessageMiddleware',
- 'piwik.django.middleware.PiwikMiddleware',
- # Uncomment the next line for simple clickjacking protection:
- # 'django.middleware.clickjacking.XFrameOptionsMiddleware',
- 'pagination.middleware.PaginationMiddleware',
- 'fnpdjango.middleware.SetRemoteAddrFromXRealIP',
-)
-
-
--- /dev/null
+MIDDLEWARE_CLASSES = (
+ 'django.contrib.sessions.middleware.SessionMiddleware',
+ #'django.middleware.locale.LocaleMiddleware',
+ 'fnpdjango.middleware.URLLocaleMiddleware',
+
+ 'django.middleware.common.CommonMiddleware',
+ 'django.middleware.csrf.CsrfViewMiddleware',
+ 'django.contrib.auth.middleware.AuthenticationMiddleware',
+)
+
+if 'django_cas' in INSTALLED_APPS:
+ MIDDLEWARE_CLASSES += (
+ 'django_cas.middleware.CASMiddleware',
+ )
+
+MIDDLEWARE_CLASSES += (
+ 'django.contrib.messages.middleware.MessageMiddleware',
+ 'piwik.django.middleware.PiwikMiddleware',
+ # Uncomment the next line for simple clickjacking protection:
+ # 'django.middleware.clickjacking.XFrameOptionsMiddleware',
+ 'pagination.middleware.PaginationMiddleware',
+ 'fnpdjango.middleware.SetRemoteAddrFromXRealIP',
+)
+
+
+++ /dev/null
-from fnpdjango.utils.text.textilepl import textile_pl
-
-COMMENTS_APP = "django_comments_xtd"
-COMMENTS_XTD_CONFIRM_EMAIL = False
-
-MARKUP_FIELD_TYPES = (
- ('textile_pl', textile_pl),
-)
-COMMENTS_XTD_LIST_URL_ACTIVE = True
-#COMMENTS_XTD_LIST_PAGINATE_BY = 10
-
-THUMBNAIL_QUALITY = 95
-
-GRAVATAR_DEFAULT_IMAGE = 'http://localhost:8000/static/img/avatar.png'
-
-CAS_SERVER_URL = 'http://logowanie.nowoczesnapolska.org.pl/cas/'
-CAS_VERSION = '1'
--- /dev/null
+from fnpdjango.utils.text.textilepl import textile_pl
+
+COMMENTS_APP = "django_comments_xtd"
+COMMENTS_XTD_CONFIRM_EMAIL = False
+
+MARKUP_FIELD_TYPES = (
+ ('textile_pl', textile_pl),
+)
+COMMENTS_XTD_LIST_URL_ACTIVE = True
+#COMMENTS_XTD_LIST_PAGINATE_BY = 10
+
+THUMBNAIL_QUALITY = 95
+
+GRAVATAR_DEFAULT_IMAGE = 'http://localhost:8000/static/img/avatar.png'
+
+CAS_SERVER_URL = 'http://logowanie.nowoczesnapolska.org.pl/cas/'
+CAS_VERSION = '1'
+++ /dev/null
-MEDIA_ROOT = path.join(PROJECT_DIR, 'media/')
-MEDIA_URL = '/media/'
-STATIC_ROOT = path.join(PROJECT_DIR, 'static/')
-STATIC_URL = '/static/'
-
-STATICFILES_FINDERS = (
- 'django.contrib.staticfiles.finders.FileSystemFinder',
- 'django.contrib.staticfiles.finders.AppDirectoriesFinder',
-# 'django.contrib.staticfiles.finders.DefaultStorageFinder',
-)
-
-STATICFILES_STORAGE = 'pipeline.storage.PipelineCachedStorage'
-PIPELINE_CSS_COMPRESSOR = None
-PIPELINE_JS_COMPRESSOR = None
-PIPELINE_CSS = {
- 'base': {
- 'source_filenames': (
- 'css/base.scss',
- 'css/layout.scss',
- 'css/header.scss',
- 'css/menu.scss',
- 'css/search.scss',
- 'css/sidebar.scss',
- 'css/promobox.scss',
- 'css/entry.scss',
- 'css/footer.scss',
- 'css/prevnext.scss',
- 'css/forms.scss',
- 'events/events.scss',
- ),
- 'output_filename': 'compressed/base.css',
- },
-}
-PIPELINE_JS = {
- 'base': {
- 'source_filenames': (
- 'js/promobox.js',
- ),
- 'output_filename': 'compressed/base.js',
- },
-}
-
-PIPELINE_COMPILERS = (
- 'pipeline.compilers.sass.SASSCompiler',
-)
-
-PIPELINE_STORAGE = 'pipeline.storage.PipelineFinderStorage'
--- /dev/null
+MEDIA_ROOT = path.join(PROJECT_DIR, 'media/')
+MEDIA_URL = '/media/'
+STATIC_ROOT = path.join(PROJECT_DIR, 'static/')
+STATIC_URL = '/static/'
+
+STATICFILES_FINDERS = (
+ 'django.contrib.staticfiles.finders.FileSystemFinder',
+ 'django.contrib.staticfiles.finders.AppDirectoriesFinder',
+# 'django.contrib.staticfiles.finders.DefaultStorageFinder',
+)
+
+STATICFILES_STORAGE = 'pipeline.storage.PipelineCachedStorage'
+PIPELINE_CSS_COMPRESSOR = None
+PIPELINE_JS_COMPRESSOR = None
+PIPELINE_CSS = {
+ 'base': {
+ 'source_filenames': (
+ 'css/base.scss',
+ 'css/layout.scss',
+ 'css/header.scss',
+ 'css/menu.scss',
+ 'css/search.scss',
+ 'css/sidebar.scss',
+ 'css/promobox.scss',
+ 'css/entry.scss',
+ 'css/footer.scss',
+ 'css/prevnext.scss',
+ 'css/forms.scss',
+ 'events/events.scss',
+ ),
+ 'output_filename': 'compressed/base.css',
+ },
+}
+PIPELINE_JS = {
+ 'base': {
+ 'source_filenames': (
+ 'js/promobox.js',
+ ),
+ 'output_filename': 'compressed/base.js',
+ },
+}
+
+PIPELINE_COMPILERS = (
+ 'pipeline.compilers.sass.SASSCompiler',
+)
+
+PIPELINE_STORAGE = 'pipeline.storage.PipelineFinderStorage'
+++ /dev/null
-MENU_MODULE = 'prawokultury.menu_items'
--- /dev/null
+from fnpdjango.utils.settings import LazyUGettextLazy as _
+from migdal.helpers import EntryType
+
+MIGDAL_TYPES = (
+ EntryType('news', _('news'), commentable=True, on_main=True,
+ promotable=True, categorized=True),
+ EntryType('publications', _('publications')),
+ EntryType('info', _('info')),
+)
+
+MENU_MODULE = 'prawokultury.menu_items'
import os.path
import glob
-conffiles = glob.glob(os.path.join(os.path.dirname(__file__), 'settings.d', '*.conf'))
+conffiles = glob.glob(os.path.join(os.path.dirname(__file__), 'settings.d', '*.py'))
conffiles.sort()
for f in conffiles:
execfile(os.path.abspath(f))
<link rel="shortcut icon" type="image/png" href="{% static "img/favicon.png" %}" />
{% compressed_css 'base' %}
+ <meta charset="UTF-8" />
<meta property='og:url' content='{% block "ogurl" %}{% url 'migdal_main' %}{% endblock %}' />
<meta property='og:title' content='{% block "ogtitle" %}{% trans "Culture's right" %}{% endblock %}' />
<meta property='og:site_name' content='{% trans "Culture's right" %}' />
django-pagination
-e git+git://github.com/fnp/fnpdjango.git@9a5b05c52311da4f726fec29d8be7d173f695352#egg=fnpdjango
--e git+git://github.com/fnp/django-migdal.git@734cd58d3f12c5397b42c1ae122c947500386014#egg=django-migdal
+-e git+git://github.com/fnp/django-migdal.git@fe16cac52a33bd593bc8916415dc939d32dfb8f3#egg=django-migdal
textile
django-markupfield
fnp / prawokultury.git / commitdiff