From ac6167f3a698dc8c142d0808fcd7aaa0f00e1f65 Mon Sep 17 00:00:00 2001
From: Byron Jones <bjones@mozilla.com>
Date: Mon, 18 Nov 2013 22:24:39 +0800
Subject: Bug 937180: creation_ts of bugs and attachments always at 0 seconds
 r=dkl, a=simon

---
 template/en/default/attachment/list.html.tmpl | 2 +-
 template/en/default/bug/edit.html.tmpl        | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'template')

diff --git a/template/en/default/attachment/list.html.tmpl b/template/en/default/attachment/list.html.tmpl
index 9c9247980..48921e3ca 100644
--- a/template/en/default/attachment/list.html.tmpl
+++ b/template/en/default/attachment/list.html.tmpl
@@ -88,7 +88,7 @@ function toggle_display(link) {
             <br>
             <a href="#attach_[% attachment.id %]"
                title="Go to the comment associated with the attachment">
-              [%- attachment.attached FILTER time %]</a>,
+              [%- attachment.attached FILTER time("%Y-%m-%d %H:%M %Z") %]</a>,
 
             [%# No need to recreate the exact same template if we already have it. %]
             [% attacher_id = attachment.attacher.id %]
diff --git a/template/en/default/bug/edit.html.tmpl b/template/en/default/bug/edit.html.tmpl
index acdcdbf7a..a6857f0d5 100644
--- a/template/en/default/bug/edit.html.tmpl
+++ b/template/en/default/bug/edit.html.tmpl
@@ -711,7 +711,7 @@
       Reported:
     </th>
     <td>
-     [% bug.creation_ts FILTER time %] by [% INCLUDE global/user.html.tmpl who = bug.reporter %]
+     [% bug.creation_ts FILTER time("%Y-%m-%d %H:%M %Z") %] by [% INCLUDE global/user.html.tmpl who = bug.reporter %]
     </td>
   </tr>
   
@@ -720,7 +720,7 @@
       Modified:
     </th>
     <td>
-      [% bug.delta_ts FILTER time FILTER replace(':\d\d$', '') FILTER replace(':\d\d ', ' ')%] 
+      [% bug.delta_ts FILTER time("%Y-%m-%d %H:%M %Z") %]
       (<a href="show_activity.cgi?id=[% bug.bug_id %]">[%# terms.Bug %]History</a>)
     </td>
   
-- 
cgit v1.2.3-24-g4f1b