diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b659fd97a2e131d506fbdebdb8f016c5f48b77c6..4031d76fc44a3ce7cec48b85b8359761b4c9a8b6 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -12,6 +12,7 @@ variables: before_script: - ln -srf internewshid/local_settings.py.gitlab internewshid/local_settings.py + - ln -srf internewshid/language_settings.py.english internewshid/language_settings.py - echo "SECRET_KEY = '$DJANGO_SECRET_KEY'" >> internewshid/private_settings.py - echo "DB_PASSWORD = '$MYSQL_ROOT_PASSWORD'" >> internewshid/private_settings.py - apt update && apt install -y default-libmysqlclient-dev python-pymysql python-mysqldb nodejs node-less diff --git a/internewshid/.gitignore b/internewshid/.gitignore new file mode 100644 index 0000000000000000000000000000000000000000..ca1a27e309de9341568f047fe6b58bb2e7896c19 --- /dev/null +++ b/internewshid/.gitignore @@ -0,0 +1 @@ +/language_settings.py diff --git a/internewshid/language_settings.py.english b/internewshid/language_settings.py.english new file mode 100644 index 0000000000000000000000000000000000000000..bb0920f62eae2a8d89ae927e8ffa50185a21f5b7 --- /dev/null +++ b/internewshid/language_settings.py.english @@ -0,0 +1 @@ +LANGUAGE_CODE = 'en' diff --git a/internewshid/language_settings.py.french b/internewshid/language_settings.py.french new file mode 100644 index 0000000000000000000000000000000000000000..696af27460dbcaf9a6775879b45ace5422f91f8f --- /dev/null +++ b/internewshid/language_settings.py.french @@ -0,0 +1 @@ +LANGUAGE_CODE = 'fr' diff --git a/internewshid/settings.py b/internewshid/settings.py index 9c45b28df3e4ce7c927445600469d8bb7dcf2d29..f14018c68de1d6f8a3d6503a084590aebe63094b 100644 --- a/internewshid/settings.py +++ b/internewshid/settings.py @@ -16,14 +16,11 @@ warnings.filterwarnings( BASE_DIR = path.abspath(path.dirname(__file__)) - DEBUG = False TEMPLATE_DEBUG = DEBUG - SECRET_KEY = private_settings.SECRET_KEY - ADMINS = ( ('Aptivate internewshid team', 'internewshid-team@aptivate.org'), ) @@ -39,6 +36,7 @@ LANGUAGE_CODE = 'en' LANGUAGES = [ ('en', 'English'), + ('fr', 'French'), ] SITE_ID = 1 @@ -277,6 +275,8 @@ TEMPLATES = [ CSRF_FAILURE_VIEW = 'hid.views.csrf.csrf_failure' +import language_settings + if DEBUG: INSTALLED_APPS += ( 'django_extensions', diff --git a/setup.cfg b/setup.cfg index 301a4299742e1fec99a3aa30ffe6f634706d6196..598624996a1a77327ad27d19f299130b1279750b 100644 --- a/setup.cfg +++ b/setup.cfg @@ -23,7 +23,7 @@ complexity = 15 [isort] sections=FUTURE,STDLIB,DJANGO,THIRDPARTY,FIRSTPARTY,LOCALFOLDER multi_line_output=5 -skip=migrations,.ve,local_settings.py,private_settings.py,.ansible +skip=migrations,.ve,local_settings.py,private_settings.py,language_settings.py,.ansible known_django=django known_third_party=dal virtual_env=.ve