resolve last_reported_by vs last_updated_by duplication

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

diff --git a/app/views/issues/index.html.erb b/app/views/issues/index.html.erb
index 7a7da45786d097c74eb16737d325e621401f35b8..56de810c21fe3efd9446e47404962e2abdeb8468 100644 (file)
--- a/app/views/issues/index.html.erb
+++ b/app/views/issues/index.html.erb
@@ -1,41 +1,44 @@
-<p id= "notice"><%= notice %></p>
-
 <% content_for :heading do %>
-  <h1>List of <%= @user_role %> issues:</h1>
+  <h1><%= t ".title" %></h1>
 <% end %>
 
 <%= form_tag(issues_path, :method => :get) do %>
-Search for a particular issue(s):  <br/>
-<%= select :status, nil, [['open', 0],['resolved',2],['ignored',1]],{:include_blank => "Select status"},data: { behavior: 'category_dropdown' } %>
-<%= select :issue_type, nil, @issue_types,{:include_blank => "Select type"}, data: { behavior: 'category_dropdown' } %>
-<%= text_field_tag :search_by_user, params[:search_by_user], placeholder: "Reported User" %>
-<%= select :last_reported_by, nil, @users.all.collect  {|f| [f.display_name, f.id]} << ['Not updated',"nil"], {:include_blank => "Select last updated by"}, data: { behavior: 'category_dropdown' } %>
-<%= submit_tag "Search" %>
+<p><%= t ".search_guidance" %></p>
+<%= select :status, nil, [['open', 0], ['resolved', 2], ['ignored', 1]], { :include_blank => t(".select_status")}, data: { behavior: 'category_dropdown' } %>
+<%= select :issue_type, nil, @issue_types, { :include_blank => t(".select_type")}, data: { behavior: 'category_dropdown' } %>
+<%= text_field_tag :search_by_user, params[:search_by_user], placeholder: t(".reported_user") %>
+<%= select :last_updated_by, nil, @users.all.collect  {|f| [f.display_name, f.id]} << [ t(".not_updated"), "nil"], { :include_blank => t(".select_last_updated_by")}, data: { behavior: 'category_dropdown' } %>
+<%= submit_tag t(".search") %>
 <% end %>
 <br/>
+
+<% if @issues.length == 0 %>
+  <p><%= t ".issues_not_found" %></p>
+<% end %>
+
 <br/>
 
 <table>
   <thead>
     <tr>
-      <td style="width:40px;"><b> <%= sortable("status") %></b></td>
-      <td style="width:160px;"><b> <%= sortable("report_count", "Number of Reports") %></b></td>
-      <td style="width:141px;"><b> <%= sortable("updated_at","Last updated at") %></b></td>
-      <td style="width:140px;"><b> <%= sortable("updated_by","Last updated by") %></b></td>
-      <td style="width:203px;"><b> Link to reports </b></td>
-      <td style="width:128px;"><b> <%= sortable("reported_user_id","Reported User") %> </b></td>
-      <td style="width:67px;"><b> Link to reported instance</b></td>
+      <td><b><%= t ".status" %></b></td>
+      <td><b><%= t ".number_of_reports" %></b></td>
+      <td><b><%= t ".last_updated_at" %></b></td>
+      <td><b><%= t ".last_updated_by" %></b></td>
+      <td><b><%= t ".link_to_reports" %></b></td>
+      <td><b><%= t ".reported_user" %></b></td>
+      <td><b><%= t ".link_to_reported_instance" %></b></td>
     </tr>
   </thead>
   <tbody>
     <% @issues.each do |issue| %>
       <tr>
         <td><%= issue.status.humanize %></td>
-        <td style="text-align:center;"><%= issue.report_count %></td>
+        <td style="text-align:center;"><%= issue.reports_count %></td>
         <td><%= l(issue.updated_at.to_datetime, :format => :friendly) %></td>
         <td><% if issue.user_updated %> <%= issue.user_updated.display_name %> <% else %> - <% end %></td>
         <td><%= reports_url(issue) %></td>
-        <td><%= link_to issue.user.display_name , :controller => :user, :action => :view,:display_name => issue.user.display_name %></td>
+        <td><%= link_to issue.reported_user.display_name , :controller => :user, :action => :view, :display_name => issue.reported_user.display_name %></td>
         <td><%= instance_url(issue.reportable) %></td>
       </tr>
     <% end %>