added all needed fresh
|
|
@ -1,5 +1,10 @@
|
||||||
|
import os
|
||||||
import os # isort:skip
|
import os # isort:skip
|
||||||
gettext = lambda s: s
|
|
||||||
|
|
||||||
|
def gettext(s): return s
|
||||||
|
|
||||||
|
|
||||||
DATA_DIR = os.path.dirname(os.path.dirname(__file__))
|
DATA_DIR = os.path.dirname(os.path.dirname(__file__))
|
||||||
"""
|
"""
|
||||||
Django settings for boday_it project.
|
Django settings for boday_it project.
|
||||||
|
|
@ -13,7 +18,6 @@ For the full list of settings and their values, see
|
||||||
https://docs.djangoproject.com/en/1.11/ref/settings/
|
https://docs.djangoproject.com/en/1.11/ref/settings/
|
||||||
"""
|
"""
|
||||||
|
|
||||||
import os
|
|
||||||
|
|
||||||
# Build paths inside the project like this: os.path.join(BASE_DIR, ...)
|
# Build paths inside the project like this: os.path.join(BASE_DIR, ...)
|
||||||
BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
|
BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
|
||||||
|
|
@ -34,18 +38,13 @@ ALLOWED_HOSTS = ['ww2.boday-it.ch','127.0.0.1']
|
||||||
# Application definition
|
# Application definition
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
ROOT_URLCONF = 'boday_it.urls'
|
ROOT_URLCONF = 'boday_it.urls'
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
# Internationalization
|
# Internationalization
|
||||||
# https://docs.djangoproject.com/en/1.11/topics/i18n/
|
# https://docs.djangoproject.com/en/1.11/topics/i18n/
|
||||||
|
|
||||||
LANGUAGE_CODE = 'en'
|
LANGUAGE_CODE = 'de'
|
||||||
|
|
||||||
TIME_ZONE = 'America/New_York'
|
TIME_ZONE = 'America/New_York'
|
||||||
|
|
||||||
|
|
@ -143,22 +142,38 @@ INSTALLED_APPS = [
|
||||||
]
|
]
|
||||||
|
|
||||||
LANGUAGES = (
|
LANGUAGES = (
|
||||||
## Customize this
|
# Customize this
|
||||||
('en', gettext('en')),
|
('en', gettext('en')),
|
||||||
|
('de', gettext('de')),
|
||||||
)
|
)
|
||||||
|
|
||||||
CMS_LANGUAGES = {
|
CMS_LANGUAGES = {
|
||||||
## Customize this
|
# Customize this
|
||||||
1: [
|
1: [
|
||||||
{
|
{
|
||||||
'redirect_on_fallback': True,
|
# 'redirect_on_fallback': True,
|
||||||
'code': 'en',
|
'code': 'de',
|
||||||
'hide_untranslated': False,
|
'hide_untranslated': False,
|
||||||
|
'name': gettext('de'),
|
||||||
|
'public': True,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
'code': 'en',
|
||||||
'name': gettext('en'),
|
'name': gettext('en'),
|
||||||
|
'fallbacks': ['de'],
|
||||||
'public': True,
|
'public': True,
|
||||||
},
|
},
|
||||||
],
|
],
|
||||||
|
2: [
|
||||||
|
{
|
||||||
|
'code': 'en',
|
||||||
|
'name': gettext('en'),
|
||||||
|
'public': True,
|
||||||
|
'fallbacks': ['de'],
|
||||||
|
},
|
||||||
|
],
|
||||||
'default': {
|
'default': {
|
||||||
|
'fallbacks': ['en', 'de'],
|
||||||
'redirect_on_fallback': True,
|
'redirect_on_fallback': True,
|
||||||
'public': True,
|
'public': True,
|
||||||
'hide_untranslated': False,
|
'hide_untranslated': False,
|
||||||
|
|
@ -166,7 +181,7 @@ CMS_LANGUAGES = {
|
||||||
}
|
}
|
||||||
|
|
||||||
CMS_TEMPLATES = (
|
CMS_TEMPLATES = (
|
||||||
## Customize this
|
# Customize this
|
||||||
('fullwidth.html', 'Fullwidth'),
|
('fullwidth.html', 'Fullwidth'),
|
||||||
('sidebar_left.html', 'Sidebar Left'),
|
('sidebar_left.html', 'Sidebar Left'),
|
||||||
('sidebar_right.html', 'Sidebar Right')
|
('sidebar_right.html', 'Sidebar Right')
|
||||||
|
|
|
||||||
|
|
@ -1,14 +0,0 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<!-- Generator: Adobe Illustrator 18.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
|
|
||||||
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
|
|
||||||
<svg version="1.1" id="Слой_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
|
|
||||||
viewBox="0 0 150.1 26.4" enable-background="new 0 0 150.1 26.4" xml:space="preserve">
|
|
||||||
<rect x="43.2" fill="#FFFFFF" width="6.4" height="26.4"/>
|
|
||||||
<polygon fill="#FFFFFF" points="73.6,26.4 57.6,0 64.9,0 76.1,19.2 86.6,0 93.2,0 78,26.4 "/>
|
|
||||||
<rect x="100.6" fill="#FFFFFF" width="6.4" height="26.4"/>
|
|
||||||
<path fill="#FFFFFF" d="M148.3,1.7c-0.9-0.8-2.3-1.7-5-1.7h-20.4c-2.7,0-4,0.9-5,1.7s-1.9,2-1.9,4.5v13.9c0,2.4,0.9,3.7,1.9,4.5
|
|
||||||
c0.9,0.8,2.3,1.7,5,1.7h20.4c2.6,0,4-0.9,4.9-1.7c1-0.8,1.9-2.1,1.9-4.5V6.2C150.1,3.7,149.2,2.5,148.3,1.7z M143.7,19.3
|
|
||||||
c0,1.2-1.2,2.1-2.7,2.1h-15.7c-1.5,0-2.7-0.9-2.7-2.1V7c0-1.2,1.2-2.1,2.7-2.1H141c1.5,0,2.7,1,2.7,2.1V19.3z"/>
|
|
||||||
<path fill="#FFFFFF" d="M0,0v26.4l0,0h27.2c2.6,0,4-0.9,4.9-1.7c1-0.8,1.9-2.1,1.9-4.5V6.2c0-2.5-0.9-3.7-1.9-4.5
|
|
||||||
c-0.9-0.8-2.3-1.7-5-1.7L0,0L0,0z M27.6,19.3c0,1.2-1.2,2.1-2.7,2.1H6.4v-2.1V7V4.9h18.4c1.5,0,2.7,1,2.7,2.1v12.2H27.6z"/>
|
|
||||||
</svg>
|
|
||||||
|
Before Width: | Height: | Size: 1.2 KiB |
|
Before Width: | Height: | Size: 1.5 KiB |
|
Before Width: | Height: | Size: 888 B |
|
Before Width: | Height: | Size: 924 B |
|
Before Width: | Height: | Size: 670 KiB |
|
Before Width: | Height: | Size: 162 KiB |
|
Before Width: | Height: | Size: 77 KiB |
|
|
@ -9,7 +9,23 @@ from django.contrib import admin
|
||||||
from django.contrib.sitemaps.views import sitemap
|
from django.contrib.sitemaps.views import sitemap
|
||||||
from django.contrib.staticfiles.urls import staticfiles_urlpatterns
|
from django.contrib.staticfiles.urls import staticfiles_urlpatterns
|
||||||
from django.views.static import serve
|
from django.views.static import serve
|
||||||
|
"""
|
||||||
|
from django.views.i18n import JavaScriptCatalog
|
||||||
|
|
||||||
|
|
||||||
|
admin.autodiscover()
|
||||||
|
|
||||||
|
urlpatterns = i18n_patterns(
|
||||||
|
url(r'^jsi18n/$', JavaScriptCatalog.as_view(), name='javascript-catalog'),
|
||||||
|
)
|
||||||
|
urlpatterns += staticfiles_urlpatterns()
|
||||||
|
|
||||||
|
# note the django CMS URLs included via i18n_patterns
|
||||||
|
urlpatterns += i18n_patterns(
|
||||||
|
url(r'^admin/', include(admin.site.urls)),
|
||||||
|
url(r'^', include('cms.urls')),
|
||||||
|
)
|
||||||
|
"""
|
||||||
admin.autodiscover()
|
admin.autodiscover()
|
||||||
|
|
||||||
urlpatterns = [
|
urlpatterns = [
|
||||||
|
|
|
||||||