From c3f76685c9841b28351ccdf9c5424909a907d9d9 Mon Sep 17 00:00:00 2001
From: Daniel Levy <daniell@aptivate.org>
Date: Wed, 8 Jan 2020 17:11:15 +0000
Subject: [PATCH] Update settings to handle language code
---
.gitlab-ci.yml | 1 +
internewshid/.gitignore | 1 +
internewshid/language_settings.py.english | 1 +
internewshid/language_settings.py.french | 1 +
internewshid/settings.py | 6 +++---
setup.cfg | 2 +-
6 files changed, 8 insertions(+), 4 deletions(-)
create mode 100644 internewshid/.gitignore
create mode 100644 internewshid/language_settings.py.english
create mode 100644 internewshid/language_settings.py.french
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b659fd97..4031d76f 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 00000000..ca1a27e3
--- /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 00000000..bb0920f6
--- /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 00000000..696af274
--- /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 9c45b28d..f14018c6 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 301a4299..59862499 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
--
GitLab