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

:Merge remote-tracking branch 'remotes/origin/feature/digital.glarus.german' into develop

Browse source 
Conflicts:
	dynamicweb/settings-test/__init__.py
	requirements.txt
	templates/cms/ungleich.ch/_footer.html
	templates/cms/ungleich.ch/_header_base.html
	templates/cms/ungleich.ch/_menu.html
	templates/cms/ungleich.ch/base.html
	templates/cms/ungleich.ch/blog.html
	templates/cms/ungleich.ch/page.html
	templates/cms/ungleichch/__init__.py
	templates/cms/ungleichch/_footer.html
	templates/cms/ungleichch/_header_base.html
	templates/cms/ungleichch/_menu.html
	templates/cms/ungleichch/base.html
	templates/cms/ungleichch/blog.html
	templates/cms/ungleichch/page.html
	ungleich/templates/cms/ungleichch/_footer.html
	ungleich/templates/cms/ungleichch/_header_base.html
	ungleich/templates/cms/ungleichch/_menu.html
	ungleich/templates/cms/ungleichch/base_ungleich.html
	ungleich/templates/cms/ungleichch/blog_ungleich.html
	ungleich/templates/cms/ungleichch/page.html
This commit is contained in:
rascencio 2016-04-22 10:08:33 +02:00
commit 4389230b60
18 changed files with 678 additions and 0 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'