summaryrefslogtreecommitdiff
path: root/example_project
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@iggdrasil.net>2024-05-16 15:38:00 +0200
committerÉtienne Loks <etienne.loks@iggdrasil.net>2024-05-16 15:41:12 +0200
commit78a293c9959c17505ea478c578a348348145d734 (patch)
tree59fb16af9e7538593964049b3706e703e6d4cb8b /example_project
parent10961d9f7c8f857fd4621bbaaca9feefca86f5f8 (diff)
downloadIshtar-78a293c9959c17505ea478c578a348348145d734.tar.bz2
Ishtar-78a293c9959c17505ea478c578a348348145d734.zip
🔧 load custom settings after local settings
Diffstat (limited to 'example_project')
-rw-r--r--example_project/settings.py10
1 files changed, 5 insertions, 5 deletions
diff --git a/example_project/settings.py b/example_project/settings.py
index 511c84f15..39a79f671 100644
--- a/example_project/settings.py
+++ b/example_project/settings.py
@@ -339,11 +339,6 @@ SHARE_BASE_PATH = FIXTURE_AUTH_PATH
AUTH_PASSWORD_VALIDATORS = []
try:
- from custom_settings import *
-except ImportError:
- pass
-
-try:
from local_settings import *
except ImportError as e:
try:
@@ -351,6 +346,11 @@ except ImportError as e:
except ImportError as e:
print("Unable to load local_settings.py:", e)
+try:
+ from custom_settings import *
+except ImportError:
+ pass
+
if USE_TRANSLATION_OVERLOAD:
INSTALLED_APPS.insert(0, "overload_translation")