Merge remote-tracking branch 'upstream/pull/4477'

[rails.git] / app / views / issues / show.html.erb

diff --git a/app/views/issues/show.html.erb b/app/views/issues/show.html.erb
index 71b5b40f6fef543d58d2128833f3627c90dc4b97..e2099f8e6878cab075faf7657940676d408bfb42 100644 (file)
--- a/app/views/issues/show.html.erb
+++ b/app/views/issues/show.html.erb
@@ -9,16 +9,19 @@
     <% else %>
       | <%= t ".no_reports" %>
     <% end %>
     <% else %>
       | <%= t ".no_reports" %>
     <% end %>

-      | <%= t ".report_created_at",
-              :datetime => l(@issue.created_at.to_datetime, :format => :friendly) %>
+      | <%= t ".report_created_at_html",
+              :datetime => tag.time(l(@issue.created_at.to_datetime, :format => :friendly),
+                                    :datetime => @issue.created_at.xmlschema) %>

     <% if @issue.resolved_at? %>
     <% if @issue.resolved_at? %>

-      | <%= t ".last_resolved_at",
-              :datetime => l(@issue.resolved_at.to_datetime, :format => :friendly) %>
+      | <%= t ".last_resolved_at_html",
+              :datetime => tag.time(l(@issue.resolved_at.to_datetime, :format => :friendly),
+                                    :datetime => @issue.resolved_at.xmlschema) %>

     <% end %>
     <% if @issue.user_updated %>
     <% end %>
     <% if @issue.user_updated %>

-      | <%= t ".last_updated_at",
-              :datetime => l(@issue.updated_at.to_datetime, :format => :friendly),
-              :displayname => @issue.user_updated.display_name %>
+      | <%= t ".last_updated_at_html",
+              :datetime => tag.time(l(@issue.updated_at.to_datetime, :format => :friendly),
+                                    :datetime => @issue.updated_at.xmlschema),
+              :displayname => link_to(@issue.user_updated.display_name, user_path(@issue.user_updated)) %>

     <% end %>
   </small>
 </p>
     <% end %>
   </small>
 </p>