Merge branch 'master' into next

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

diff --git a/app/views/issues/_reports.html.erb b/app/views/issues/_reports.html.erb
index 68e69ee72570f83b9a81d1d15c7aa9523e9fbe1e..b499288a2446d4059afcc8ea5ed0f415ade6c460 100644 (file)
--- a/app/views/issues/_reports.html.erb
+++ b/app/views/issues/_reports.html.erb
@@ -1,11 +1,12 @@
 <% reports.each do |report| %>
-  <div class="reports">
+  <div class="report">
     <div style="float:left">
-      <%= link_to user_thumbnail(report.user), :controller => :user, :action =>:view, :display_name => report.user.display_name %>
+      <%= link_to user_thumbnail(report.user), user_path(report.user.display_name) %>
     </div>
-    Reported by <b><%= link_to report.user.display_name, :controller => :user, :action =>:view, :display_name => report.user.display_name %></b> <br/>
+    <%= t ".reported_by_html", :category => report.category, :user => link_to(report.user.display_name, user_path(report.user.display_name)) %>
+    <br/>
     <span class="deemphasize">
-      On <%= l report.updated_at.to_datetime, :format => :friendly %>
+      <%= t(".updated_at", :datetime => l(report.updated_at.to_datetime, :format => :friendly)) %>
     </span>
     <br/>
     <%= report.details %>