Add time to date for flagged reviews (bug 504003)

mozilla · May 24, 2011 · 67b524d · 67b524d
1 parent 774c36c
commit 67b524d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/apps/editors/templates/editors/queue.html b/apps/editors/templates/editors/queue.html
@@ -108,7 +108,7 @@ <h3>
               {% for reason in review.instance.reviewflag_set.all() %}
               <li>
               <div>
-                {% trans user=reason.user|user_link, date=reason.modified|datetime,
+                {% trans user=reason.user|user_link, date=reason.modified|babel_datetime,
                          reason=flags[reason.flag] %}
                 <strong>{{ reason }}</strong>
                 <span class="light">Flagged by {{ user }} on {{ date }}</span>

diff --git a/apps/editors/tests/test_views.py b/apps/editors/tests/test_views.py
@@ -761,8 +761,13 @@ def test_results(self):
         assert doc('#id_form-0-action_1:checked')
 
         current_date = jingo.helpers.datetime(datetime.now())
-        eq_(doc('.reviews-flagged-reasons span.light').text(),
-            'Flagged by editor on %s' % current_date)
+        text = doc('.reviews-flagged-reasons span.light').text()
+        assert 'Flagged by editor on %s' % current_date in text, (
+                ('Unexpected text: %s' % text))
+
+        # Check that a time is included in the text
+        assert re.search("[0-9]+:[0-9]{2}:[0-9]{2} (AM|PM)", text), (
+                ('Unexpected text: %s' % text))
 
     def setup_actions(self, action):
         ctx = self.client.get(self.url).context