From b7f9a786032c27a501a26c9ecbb21a5caf10945e Mon Sep 17 00:00:00 2001 From: syedimranhassan Date: Wed, 23 Jan 2019 15:34:56 +0500 Subject: [PATCH] Changed time zone to UTC for lms/cms --- cms/envs/common.py | 1 + cms/envs/production.py | 2 +- lms/envs/common.py | 1 + lms/envs/production.py | 2 +- 4 files changed, 4 insertions(+), 2 deletions(-) diff --git a/cms/envs/common.py b/cms/envs/common.py index 5270890854..3b90861bd3 100644 --- a/cms/envs/common.py +++ b/cms/envs/common.py @@ -661,6 +661,7 @@ STATICFILES_DIRS = [ ] # Locale/Internationalization +CELERY_TIMEZONE = 'UTC' TIME_ZONE = 'America/New_York' # http://en.wikipedia.org/wiki/List_of_tz_zones_by_name LANGUAGE_CODE = 'en' # http://www.i18nguy.com/unicode/language-identifiers.html LANGUAGES_BIDI = lms.envs.common.LANGUAGES_BIDI diff --git a/cms/envs/production.py b/cms/envs/production.py index f732ec9e1d..d47d056a98 100644 --- a/cms/envs/production.py +++ b/cms/envs/production.py @@ -227,7 +227,7 @@ DEFAULT_SITE_THEME = ENV_TOKENS.get('DEFAULT_SITE_THEME', DEFAULT_SITE_THEME) ENABLE_COMPREHENSIVE_THEMING = ENV_TOKENS.get('ENABLE_COMPREHENSIVE_THEMING', ENABLE_COMPREHENSIVE_THEMING) #Timezone overrides -TIME_ZONE = ENV_TOKENS.get('TIME_ZONE', TIME_ZONE) +TIME_ZONE = ENV_TOKENS.get('CELERY_TIMEZONE', CELERY_TIMEZONE) # Push to LMS overrides GIT_REPO_EXPORT_DIR = ENV_TOKENS.get('GIT_REPO_EXPORT_DIR', '/edx/var/edxapp/export_course_repos') diff --git a/lms/envs/common.py b/lms/envs/common.py index 28f77bff38..a8d2bb6010 100644 --- a/lms/envs/common.py +++ b/lms/envs/common.py @@ -962,6 +962,7 @@ MEDIA_ROOT = '/edx/var/edxapp/media/' MEDIA_URL = '/media/' # Locale/Internationalization +CELERY_TIMEZONE = 'UTC' TIME_ZONE = 'America/New_York' # http://en.wikipedia.org/wiki/List_of_tz_zones_by_name LANGUAGE_CODE = 'en' # http://www.i18nguy.com/unicode/language-identifiers.html # these languages display right to left diff --git a/lms/envs/production.py b/lms/envs/production.py index 4bafbae2b6..ed98d50517 100644 --- a/lms/envs/production.py +++ b/lms/envs/production.py @@ -308,7 +308,7 @@ ACTIVATION_EMAIL_SUPPORT_LINK = ENV_TOKENS.get( MOBILE_STORE_URLS = ENV_TOKENS.get('MOBILE_STORE_URLS', MOBILE_STORE_URLS) # Timezone overrides -TIME_ZONE = ENV_TOKENS.get('TIME_ZONE', TIME_ZONE) +TIME_ZONE = ENV_TOKENS.get('CELERY_TIMEZONE', CELERY_TIMEZONE) # Translation overrides LANGUAGES = ENV_TOKENS.get('LANGUAGES', LANGUAGES)