From acd83d1c050ef07d456854471f18ccb6ee5c435f Mon Sep 17 00:00:00 2001 From: Max Sokolski Date: Mon, 25 Oct 2021 21:22:00 +0300 Subject: [PATCH] fix: use common default for LANGUAGE_COOKIE_NAME (#29096) Changes: - use default LANGUAGE_COOKIE_NAME value from common for cases when there is no `LANGUAGE_COOKIE` and `LANGUAGE_COOKIE_NAME` in ENV_TOKENS --- cms/envs/production.py | 3 ++- lms/envs/production.py | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/cms/envs/production.py b/cms/envs/production.py index 0f9740cc4f..4685dc4039 100644 --- a/cms/envs/production.py +++ b/cms/envs/production.py @@ -601,4 +601,5 @@ COURSE_OLX_VALIDATION_IGNORE_LIST = ENV_TOKENS.get( ################# show account activate cta after register ######################## SHOW_ACCOUNT_ACTIVATION_CTA = ENV_TOKENS.get('SHOW_ACCOUNT_ACTIVATION_CTA', SHOW_ACCOUNT_ACTIVATION_CTA) -LANGUAGE_COOKIE_NAME = ENV_TOKENS.get('LANGUAGE_COOKIE', None) or ENV_TOKENS.get('LANGUAGE_COOKIE_NAME') +LANGUAGE_COOKIE_NAME = ENV_TOKENS.get('LANGUAGE_COOKIE', None) or ENV_TOKENS.get( + 'LANGUAGE_COOKIE_NAME', LANGUAGE_COOKIE_NAME) diff --git a/lms/envs/production.py b/lms/envs/production.py index 59d0d2bd41..a92af271ec 100644 --- a/lms/envs/production.py +++ b/lms/envs/production.py @@ -299,7 +299,8 @@ TIME_ZONE = ENV_TOKENS.get('CELERY_TIMEZONE', CELERY_TIMEZONE) # Translation overrides LANGUAGE_DICT = dict(LANGUAGES) -LANGUAGE_COOKIE_NAME = ENV_TOKENS.get('LANGUAGE_COOKIE', None) or ENV_TOKENS.get('LANGUAGE_COOKIE_NAME') +LANGUAGE_COOKIE_NAME = ENV_TOKENS.get('LANGUAGE_COOKIE', None) or ENV_TOKENS.get( + 'LANGUAGE_COOKIE_NAME', LANGUAGE_COOKIE_NAME) # Additional installed apps for app in ENV_TOKENS.get('ADDL_INSTALLED_APPS', []):