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

added test

Browse source
This commit is contained in:
Tomislav R 2016-05-02 02:00:38 +02:00
commit b19e33b8da
7 changed files with 86 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -175,13 +175,8 @@ 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'