moep/dynamicweb
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'develop' into feature/vm_pricing

Browse source
This commit is contained in:
Levi 2016-04-24 16:18:37 -05:00
commit 34fcb403c7
309 changed files with 62025 additions and 3871 deletions
Download patch file Download diff file Expand all files Collapse all files

5
dynamicweb/settings-test/__init__.py
View file

@ -175,8 +175,13 @@ USE_L10N = True
USE_TZ = True
LANGUAGES = (
<<<<<<< HEAD:dynamicweb/settings-test/__init__.py
('en-us', _('English')),
('de', _('Deutsch')),
=======
('en-us', _('US English')),
('de', _('German')),
>>>>>>> remotes/origin/feature/digital.glarus.german:dynamicweb/settings.py
)
LANGUAGE_CODE = 'en-us'

4
dynamicweb/settings/base.py
View file

@ -283,9 +283,9 @@ CACHES = {
}
if LOGIN_URL is None:
LOGIN_URL = APP_ROOT_ENDPOINT + 'accounts/login/'
LOGIN_URL = APP_ROOT_ENDPOINT + 'login/'
if LOGOUT_URL is None:
LOGOUT_URL = APP_ROOT_ENDPOINT + 'accounts/logout/'
LOGOUT_URL = APP_ROOT_ENDPOINT + 'logout/'
if LOGIN_REDIRECT_URL is None:
LOGIN_REDIRECT_URL = APP_ROOT_ENDPOINT

2
dynamicweb/urls.py
View file

@ -28,7 +28,7 @@ urlpatterns += i18n_patterns('',
url(r'^digitalglarus/', include('digitalglarus.urls',
namespace="digitalglarus"),name='digitalglarus'),
url(r'^blog/',include('ungleich.urls',namespace='ungleich')),
url(r'^',include('ungleich_page.urls',namespace='ungleich_page'),name="ungleich_page"),
url(r'^',include('ungleich_page.urls',namespace='ungleich_page'),name='ungleich_page'),
url(r'^', include('cms.urls')),
)