Merge pull request resque#282 from noahd1/fix_safari_relative_time

Fix relative time display for failed jobs in Safari
quasor · May 16, 2011 · 43a42ac · 43a42ac
2 parents a1b5452 + 330ccf6
commit 43a42ac
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/lib/resque/server/views/failed.erb b/lib/resque/server/views/failed.erb
@@ -22,10 +22,10 @@
         <% else %>
         <dt>Worker</dt>
         <dd>
-          <a href="<%= u(:workers, job['worker']) %>"><%= job['worker'].split(':')[0...2].join(':') %></a> on <b class='queue-tag'><%= job['queue'] %></b > at <b><span class="time"><%= Time.parse(job['failed_at']).strftime("%F %T %z") %></span></b>
+          <a href="<%= u(:workers, job['worker']) %>"><%= job['worker'].split(':')[0...2].join(':') %></a> on <b class='queue-tag'><%= job['queue'] %></b > at <b><span class="time"><%= Time.parse(job['failed_at']).strftime("%D %T %z") %></span></b>
           <% if job['retried_at'] %>
             <div class='retried'>
-              Retried <b><span class="time"><%= Time.parse(job['retried_at']).strftime("%F %T %z") %></span></b>
+              Retried <b><span class="time"><%= Time.parse(job['retried_at']).strftime("%D %T %z") %></span></b>
               <a href="<%= u "failed/remove/#{start + index - 1}" %>" class="remove" rel="remove">Remove</a>
             </div>
           <% else %>