Skip to content

Commit 0d0291d

Browse files
committed
WIP end of Friday
1 parent ad57463 commit 0d0291d

File tree

1 file changed

+11
-3
lines changed

1 file changed

+11
-3
lines changed

src/utils/language.py

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,12 +47,20 @@ def get_constrained_language():
4747
return _original_get_language()
4848

4949
# Handle Single Language only journals
50+
# Use the stored value from middleware instead of calling get_setting()
51+
switch_language_enabled = getattr(request, "allow_language_switching", True)
52+
try:
53+
switch_language_enabled = request.journal.get_setting(
54+
group_name="general", setting_name="switch_language"
55+
)
56+
finally:
57+
# Restore our overridden function
58+
translation.get_language = original_get_language
59+
5060
if (
5161
hasattr(request, "_single_language")
5262
or not settings.USE_I18N
53-
or not request.journal.get_setting(
54-
group_name="general", setting_name="switch_language"
55-
)
63+
or not switch_language_enabled
5664
):
5765
default_language = getattr(request, "default_language", None)
5866
request._single_language = default_language or settings.LANGUAGE_CODE

0 commit comments

Comments
 (0)