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

[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 2aff5dbc9a91d348bf7b646ee1df0be6e7914d6e..b499288a2446d4059afcc8ea5ed0f415ade6c460 100644 (file)
--- a/app/views/issues/_reports.html.erb
+++ b/app/views/issues/_reports.html.erb
@@ -1,18 +1,16 @@
 <% reports.each do |report| %>
-       <div class="reports">
-               <div style="float:left">
-                       <%= link_to user_thumbnail(report.user), :controller => :user,:action =>:view, :display_name => report.user.display_name %>
-               </div>
-               <b><%= link_to report.user.display_name, :controller => :user,:action =>:view, :display_name => report.user.display_name %></b> <br/>
-               <% details =  report.details.split("--||--") %>
-               <label>Tag:</label> 
-               <%= details[1] %>
-               <br/>
-               <%= details[0] %> 
-               <br/>
-               <br/>
-               <span class="deemphasize">
-               On <%= l report.created_at.to_datetime, :format => :long %> </span>
-       </div>
-       <hr>
+  <div class="report">
+    <div style="float:left">
+      <%= link_to user_thumbnail(report.user), user_path(report.user.display_name) %>
+    </div>
+    <%= t ".reported_by_html", :category => report.category, :user => link_to(report.user.display_name, user_path(report.user.display_name)) %>
+    <br/>
+    <span class="deemphasize">
+      <%= t(".updated_at", :datetime => l(report.updated_at.to_datetime, :format => :friendly)) %>
+    </span>
+    <br/>
+    <%= report.details %>
+    <br/>
+  </div>
+  <hr>
 <% end %>