Skip to content

Commit 1accf03

Browse files
committed
Merge pull request resque#297 from noahd1/more_international_friendly_date_format
make date format more internationally friendly
2 parents 0106734 + eebf260 commit 1accf03

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

lib/resque/server/views/failed.erb

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<%start = params[:start].to_i %>
22
<%failed = Resque::Failure.all(start, 20)%>
33
<% index = 0 %>
4+
<% date_format = "%Y/%m/%d %T %z" %>
45

56
<h1>Failed Jobs</h1>
67
<%unless failed.empty?%>
@@ -22,10 +23,10 @@
2223
<% else %>
2324
<dt>Worker</dt>
2425
<dd>
25-
<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>
26+
<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(date_format) %></span></b>
2627
<% if job['retried_at'] %>
2728
<div class='retried'>
28-
Retried <b><span class="time"><%= Time.parse(job['retried_at']).strftime("%D %T %z") %></span></b>
29+
Retried <b><span class="time"><%= Time.parse(job['retried_at']).strftime(date_format) %></span></b>
2930
<a href="<%= u "failed/remove/#{start + index - 1}" %>" class="remove" rel="remove">Remove</a>
3031
</div>
3132
<% else %>

0 commit comments

Comments
 (0)