Datetime localized on gitlog page of sysadmin dashboard

lms/djangoapps/dashboard/tests/test_sysadmin.py

@@ -16,6 +16,8 @@ from django.test.client import Client
 from django.test.utils import override_settings
 from django.utils.translation import ugettext as _
 import mongoengine
+from django.utils.timezone import utc as UTC
+from util.date_utils import get_time_display, DEFAULT_DATE_TIME_FORMAT
 
 from student.roles import CourseStaffRole, GlobalStaff
 from courseware.tests.modulestore_config import TEST_DATA_XML_MODULESTORE
@@ -507,6 +509,36 @@ class TestSysAdminMongoCourseImport(SysadminBaseTestCase):
 
         self._rm_edx4edx()
 
+    def test_gitlog_date(self):
+        """
+        Make sure the date is timezone-aware and being converted/formatted
+        properly.
+        """
+
+        tz_names = [
+            'America/New_York',  # UTC - 5
+            'Asia/Pyongyang',    # UTC + 9
+            'Europe/London',     # UTC
+            'Canada/Yukon',      # UTC - 8
+            'Europe/Moscow',     # UTC + 4
+        ]
+        tz_format = DEFAULT_DATE_TIME_FORMAT
+
+        self._setstaff_login()
+        self._mkdir(getattr(settings, 'GIT_REPO_DIR'))
+
+        self._add_edx4edx()
+        date = CourseImportLog.objects.first().created.replace(tzinfo=UTC)
+
+        for timezone in tz_names:
+            with (override_settings(TIME_ZONE=timezone)):
+                date_text = get_time_display(date, tz_format, settings.TIME_ZONE)
+                response = self.client.get(reverse('gitlogs'))
+
+                self.assertIn(date_text, response.content)
+
+        self._rm_edx4edx()
+
     def test_gitlog_bad_course(self):
         """
         Make sure we gracefully handle courses that don't exist.

lms/templates/sysadmin_dashboard_gitlogs.html

 <%inherit file="/main.html" />
-<%! from django.core.urlresolvers import reverse %>
-<%! from django.utils.translation import ugettext as _ %>
+<%!
+    from django.core.urlresolvers import reverse
+    from django.utils.translation import ugettext as _
+    from django.utils.timezone import utc as UTC
+    from util.date_utils import get_time_display, DEFAULT_DATE_TIME_FORMAT
+    from django.conf import settings
+%>
 <%namespace name='static' file='/static_content.html'/>
 
 <%block name="headextra">
@@ -46,87 +51,77 @@ textarea {
 </style>
 
 <section class="container">
-<div class="sysadmin-dashboard-wrapper">
+  <div class="sysadmin-dashboard-wrapper">
 
-  <section class="sysadmin-dashboard-content" style="margin-left:10pt;margin-top:10pt;margin-right:10pt;margin-bottom:20pt">
-    <h1>${_('Sysadmin Dashboard')}</h1>
-	<hr />
-    <h2 class="instructor-nav">
-	  <a href="${reverse('sysadmin')}">${_('Users')}</a>
-      <a href="${reverse('sysadmin_courses')}">${_('Courses')}</a>
-      <a href="${reverse('sysadmin_staffing')}">${_('Staffing and Enrollment')}</a> 
-      ## Translators: refers to http://git-scm.com/docs/git-log
-      <a href="${reverse('gitlogs')}" class="active-section">${_('Git Logs')}</a>
-    </h2>
-	<hr />
+    <section class="sysadmin-dashboard-content" style="margin-left:10pt;margin-top:10pt;margin-right:10pt;margin-bottom:20pt">
+      <h1>${_('Sysadmin Dashboard')}</h1>
+      <hr />
+      <h2 class="instructor-nav">
+        <a href="${reverse('sysadmin')}">${_('Users')}</a>
+        <a href="${reverse('sysadmin_courses')}">${_('Courses')}</a>
+        <a href="${reverse('sysadmin_staffing')}">${_('Staffing and Enrollment')}</a>
+        ## Translators: refers to http://git-scm.com/docs/git-log
+        <a href="${reverse('gitlogs')}" class="active-section">${_('Git Logs')}</a>
+      </h2>
+      <hr />
 
-    <form name="dashform" method="POST" action="${reverse('sysadmin')}">
-    <input type="hidden" name="csrfmiddlewaretoken" value="${ csrf_token }">
-    <input type="hidden" name="dash_mode" value="">
+      <form name="dashform" method="POST" action="${reverse('sysadmin')}">
+        <input type="hidden" name="csrfmiddlewaretoken" value="${ csrf_token }">
+        <input type="hidden" name="dash_mode" value="">
+      </form>
 
       ## Translators: refers to http://git-scm.com/docs/git-log
-    <h3>${_('Git Logs')}</h3>
-
-%if course_id is None:
-    <table class="stat_table">
-	  <thead>
-		<tr>
-		  <th>${_('Date')}</th>
-		  <th>${_('Course ID')}</th>
-		  ## Translators: Git is a version-control system; see http://git-scm.com/about
-		  <th>${_('Git Action')}</th>
-		</tr>
-	  </thead>
-	  <tbody>
-		%for cil in cilset[:10]:
-        <% course_id_string = cil.course_id.to_deprecated_string() if cil.course_id else None %>
-        <tr>
-	      <td>${cil.created}</td>
-	      <td><a href="${reverse('gitlogs')}/${course_id_string}">${course_id_string}</a></td>
-	      <td>${cil.git_log}</td>
-		</tr>
-		%endfor
-	  </tbody>
-    </table>
-
-%else:
-
-    ## Translators: Git is a version-control system; see http://git-scm.com/about
-    <h2>${_('Recent git load activity for')} ${course_id}</h2>
-	%if error_msg:
-	<h3>${_('Error')}:</h3>
-	<p>${error_msg}</p>
-	%endif
+      <h3>${_('Git Logs')}</h3>
 
-    <table class="stat_table">
-	  <thead>
-		<tr>
-		  <th>${_('Date')}</th>
-		  <th>${_('Course ID')}</th>
-		  ## Translators: Git is a version-control system; see http://git-scm.com/about
-		  <th>${_('Git Action')}</th>
-		</tr>
-	  </thead>
-	  <tbody>
-		% for cil in cilset[:2]:
-        <% course_id_string = cil.course_id.to_deprecated_string() if cil.course_id else None %>
-        <tr>
-	      <td>${cil.created}</td>
-	      <td><a href="${reverse('gitlogs')}/${course_id_string}">${course_id_string}</a></td>
-	      <td>${cil.git_log}</td>
-		</tr>
-	
-		<tr>
-		  <td colspan="3">
-			<pre>${cil.import_log | h}</pre>
-		  </td>
-		</tr>
-		% endfor
-      </tbody>
-    </table>
+      %if course_id is not None:
+          ## Translators: Git is a version-control system; see http://git-scm.com/about
+          <h2>${_('Recent git load activity for {course_id}').format(course_id=course_id)}</h2>
+          %if error_msg:
+              <h3>${_('Error')}:</h3>
+              <p>${error_msg}</p>
+          %endif
+      %endif
 
-% endif
+      <table class="stat_table">
+        <thead>
+          <tr>
+            <th>${_('Date')}</th>
+            <th>${_('Course ID')}</th>
+            ## Translators: Git is a version-control system; see http://git-scm.com/about
+            <th>${_('Git Action')}</th>
+          </tr>
+        </thead>
+        <tbody>
+          <%
+          if course_id == None:
+              logs = cilset[:10]
+          else:
+              logs = cilset[:2]
+          %>
+          % for cil in logs:
+              <%
+                  course_id_string = cil.course_id.to_deprecated_string() if cil.course_id else None
 
-  </section>
-</div>
+                  # Appropriate datetime string for current locale and timezone
+                  date = get_time_display(cil.created.replace(tzinfo=UTC),
+                                          DEFAULT_DATE_TIME_FORMAT, coerce_tz=settings.TIME_ZONE)
+              %>
+              <tr>
+                <td>${date}</td>
+                <td><a href="${reverse('gitlogs')}/${course_id_string}">${course_id_string}</a></td>
+                <td>${cil.git_log}</td>
+              </tr>
+          %endfor
+          ## Show the full log if viewing information about a specific course
+          %if course_id is not None:
+              <tr>
+                <td colspan="3">
+                  <pre>${cil.import_log | h}</pre>
+                </td>
+              </tr>
+          %endif
+        </tbody>
+      </table>
+    </section>
+  </div>
 </section>