digitalglarus: i18n django-cms conf
This commit is contained in:
parent
df9b0eacaa
commit
9d38d3aee6
2 changed files with 10 additions and 5 deletions
|
@ -1,6 +1,7 @@
|
||||||
from django.conf.urls import patterns, include, url
|
from django.conf.urls import patterns, include, url
|
||||||
from django.contrib import admin
|
from django.contrib import admin
|
||||||
# deprecated in version 1.8
|
# deprecated in version 1.8
|
||||||
|
from django.conf.urls.i18n import i18n_patterns
|
||||||
from django.conf.urls.static import static
|
from django.conf.urls.static import static
|
||||||
|
|
||||||
from dynamicweb import settings
|
from dynamicweb import settings
|
||||||
|
@ -11,13 +12,17 @@ urlpatterns = [
|
||||||
namespace="digitalglarus")),
|
namespace="digitalglarus")),
|
||||||
url(r'^hosting/', include('hosting.urls', namespace="hosting")),
|
url(r'^hosting/', include('hosting.urls', namespace="hosting")),
|
||||||
url(r'^railshosting/', railshosting, name="rails.hosting"),
|
url(r'^railshosting/', railshosting, name="rails.hosting"),
|
||||||
url(r'^admin/', include(admin.site.urls)),
|
|
||||||
url(r'^', include('cms.urls')),
|
|
||||||
url(r'^taggit_autosuggest/', include('taggit_autosuggest.urls')),
|
url(r'^taggit_autosuggest/', include('taggit_autosuggest.urls')),
|
||||||
url(r'^jsi18n/(?P<packages>\S+?)/$',
|
url(r'^jsi18n/(?P<packages>\S+?)/$',
|
||||||
'django.views.i18n.javascript_catalog'),
|
'django.views.i18n.javascript_catalog'),
|
||||||
] + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
|
] + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
|
||||||
|
|
||||||
|
# note the django CMS URLs included via i18n_patterns
|
||||||
|
urlpatterns += i18n_patterns('',
|
||||||
|
url(r'^admin/', include(admin.site.urls)),
|
||||||
|
url(r'^', include('cms.urls')),
|
||||||
|
)
|
||||||
|
|
||||||
if settings.DEBUG:
|
if settings.DEBUG:
|
||||||
urlpatterns += patterns('',
|
urlpatterns += patterns('',
|
||||||
url(r'^media/(?P<path>.*)$',
|
url(r'^media/(?P<path>.*)$',
|
||||||
|
|
|
@ -1,5 +1,4 @@
|
||||||
{% load staticfiles cms_tags menu_tags sekizai_tags %}
|
{% load staticfiles cms_tags menu_tags sekizai_tags menu_tags %}
|
||||||
|
|
||||||
<!DOCTYPE html>
|
<!DOCTYPE html>
|
||||||
<html lang="en">
|
<html lang="en">
|
||||||
|
|
||||||
|
@ -49,7 +48,8 @@
|
||||||
</head>
|
</head>
|
||||||
|
|
||||||
<body>
|
<body>
|
||||||
{% cms_toolbar %}
|
{% cms_toolbar %}
|
||||||
|
{% language_chooser "myapp/language_chooser.html" %}
|
||||||
<div class="brand">Digital Glarus</div>
|
<div class="brand">Digital Glarus</div>
|
||||||
<div class="address-bar">
|
<div class="address-bar">
|
||||||
{% placeholder 'digital_glarus_legend' %}
|
{% placeholder 'digital_glarus_legend' %}
|
||||||
|
|
Loading…
Reference in a new issue