Merge branch 'feature/digital.glarus.german' into develop

This commit is contained in:
rascencio 2015-10-04 09:23:56 -06:00
commit df9b0eacaa
19 changed files with 445 additions and 14 deletions

View file

@ -159,7 +159,7 @@ TEMPLATE_DIRS = (
)
CMS_TEMPLATES_DIR = {
1: os.path.join(TEMPLATE_DIRS[0], 'cms/ungleich.ch/'),
1: os.path.join(TEMPLATE_DIRS[0], 'cms/'),
}
@ -187,6 +187,7 @@ USE_TZ = True
LANGUAGES = (
('en-us', _('US English')),
('de', _('German')),
)
LANGUAGE_CODE = 'en-us'