From 183d9bbb93a1a6cd0594148e7bc5ec9e7a2ae26c Mon Sep 17 00:00:00 2001
From: Jason Bau <jbau@stanford.edu>
Date: Fri, 21 Feb 2014 09:39:24 -0800
Subject: [PATCH] Use new setting for LMS deadline display instead TIME_ZONE

---
 lms/djangoapps/courseware/tests/test_views.py | 8 ++++----
 lms/envs/aws.py                               | 4 ++++
 lms/envs/common.py                            | 4 ++++
 lms/templates/courseware/accordion.html       | 4 ++--
 lms/templates/courseware/progress.html        | 2 +-
 5 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/lms/djangoapps/courseware/tests/test_views.py b/lms/djangoapps/courseware/tests/test_views.py
index 03767ce2b3..b54c6dabee 100644
--- a/lms/djangoapps/courseware/tests/test_views.py
+++ b/lms/djangoapps/courseware/tests/test_views.py
@@ -255,8 +255,8 @@ class ViewsTestCase(TestCase):
         response = self.client.get(url)
         self.assertFalse('<script>' in response.content)
 
-# setting TIME_ZONE explicitly
-@override_settings(MODULESTORE=TEST_DATA_MIXED_MODULESTORE, TIME_ZONE="America/New_York")
+# setting TIME_ZONE_DISPLAYED_FOR_DEADLINES explicitly
+@override_settings(MODULESTORE=TEST_DATA_MIXED_MODULESTORE, TIME_ZONE_DISPLAYED_FOR_DEADLINES="UTC")
 class BaseDueDateTests(ModuleStoreTestCase):
     """
     Base class that verifies that due dates are rendered correctly on a page
@@ -289,8 +289,8 @@ class BaseDueDateTests(ModuleStoreTestCase):
         self.request = self.request_factory.get("foo")
         self.request.user = self.user
 
-        self.time_with_tz = "due Sep 18, 2013 at 07:30 EDT"
-        self.time_without_tz = "due Sep 18, 2013 at 07:30"
+        self.time_with_tz = "due Sep 18, 2013 at 11:30 UTC"
+        self.time_without_tz = "due Sep 18, 2013 at 11:30"
 
     def test_backwards_compatability(self):
         # The test course being used has show_timezone = False in the policy file
diff --git a/lms/envs/aws.py b/lms/envs/aws.py
index 8014ed8da9..5122a31908 100644
--- a/lms/envs/aws.py
+++ b/lms/envs/aws.py
@@ -371,3 +371,7 @@ PASSWORD_DICTIONARY = ENV_TOKENS.get("PASSWORD_DICTIONARY", [])
 
 ### INACTIVITY SETTINGS ####
 SESSION_INACTIVITY_TIMEOUT_IN_SECONDS = AUTH_TOKENS.get("SESSION_INACTIVITY_TIMEOUT_IN_SECONDS")
+
+##### LMS DEADLINE DISPLAY TIME_ZONE #######
+TIME_ZONE_DISPLAYED_FOR_DEADLINES = ENV_TOKENS.get("TIME_ZONE_DISPLAYED_FOR_DEADLINES",
+                                                   TIME_ZONE_DISPLAYED_FOR_DEADLINES)
diff --git a/lms/envs/common.py b/lms/envs/common.py
index 69b9440e15..d8d571cf9b 100644
--- a/lms/envs/common.py
+++ b/lms/envs/common.py
@@ -1283,3 +1283,7 @@ LINKEDIN_API = {
 ##### ACCOUNT LOCKOUT DEFAULT PARAMETERS #####
 MAX_FAILED_LOGIN_ATTEMPTS_ALLOWED = 5
 MAX_FAILED_LOGIN_ATTEMPTS_LOCKOUT_PERIOD_SECS = 15 * 60
+
+
+##### LMS DEADLINE DISPLAY TIME_ZONE #######
+TIME_ZONE_DISPLAYED_FOR_DEADLINES = 'UTC'
diff --git a/lms/templates/courseware/accordion.html b/lms/templates/courseware/accordion.html
index d857fc3ba0..d256623b17 100644
--- a/lms/templates/courseware/accordion.html
+++ b/lms/templates/courseware/accordion.html
@@ -30,8 +30,8 @@
                 if section.get('due') is None:
                     due_date = ''
                 else:
-                    formatted_string = get_time_display(section['due'], due_date_display_format, coerce_tz=settings.TIME_ZONE)
-                    due_date = '' if len(formatted_string)==0 else _('due {date}'.format(date=formatted_string))
+                    formatted_string = get_time_display(section['due'], due_date_display_format, coerce_tz=settings.TIME_ZONE_DISPLAYED_FOR_DEADLINES)
+                    due_date = '' if len(formatted_string)==0 else _('due {date}').format(date=formatted_string)
               %>
               <p class="subtitle">${section['format']} ${due_date}</p>
             </a>
diff --git a/lms/templates/courseware/progress.html b/lms/templates/courseware/progress.html
index 7eeea8da59..c72857bec4 100644
--- a/lms/templates/courseware/progress.html
+++ b/lms/templates/courseware/progress.html
@@ -77,7 +77,7 @@ ${progress_graph.body(grade_summary, course.grade_cutoffs, "grade-detail-graph",
 
                 %if section.get('due') is not None:
                   <%
-                      formatted_string = get_time_display(section['due'], course.due_date_display_format, coerce_tz=settings.TIME_ZONE)
+                      formatted_string = get_time_display(section['due'], course.due_date_display_format, coerce_tz=settings.TIME_ZONE_DISPLAYED_FOR_DEADLINES)
                       due_date = '' if len(formatted_string)==0 else _(u'due {date}').format(date=formatted_string)
                   %>
                   <em>