From: Andy Allan <git@gravitystorm.co.uk>
Date: Wed, 28 Feb 2018 02:50:27 +0000 (+0800)
Subject: Allow the status to be translated in the table of results
X-Git-Tag: live~2957^2~55
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/75e178e6b884f3b2199f69e354ece2cae0a1f5fc

Allow the status to be translated in the table of results
---

diff --git a/app/views/issues/index.html.erb b/app/views/issues/index.html.erb
index b9f0b6e7d..653cd462e 100644
--- a/app/views/issues/index.html.erb
+++ b/app/views/issues/index.html.erb
@@ -4,7 +4,7 @@
 
 <%= form_tag(issues_path, :method => :get) do %>
 <p><%= t ".search_guidance" %></p>
-<%= select :status, nil, Issue.aasm.states.map(&:name).map{|state| [t(".states.#{state}"), state]}, { :include_blank => t(".select_status")}, data: { behavior: 'category_dropdown' } %>
+<%= select :status, nil, Issue.aasm.states.map(&:name).map{|state| [t("issues.states.#{state}"), state]}, { :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' } %>
@@ -33,7 +33,7 @@
   <tbody>
     <% @issues.each do |issue| %>
       <tr>
-        <td><%= issue.status.humanize %></td>
+        <td><%= t "issues.states.#{issue.status}" %></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>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 4d1ef3b49..506f73c5f 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -931,10 +931,6 @@ en:
       link_to_reports: Link to Reports
       reported_user: Reported User
       link_to_reported_instance: Link to Reported Instance
-      states:
-        ignored: Ignored
-        open: Open
-        resolved: Resolved
     create:
       successful_report: Your report has been registered sucessfully
       provide_details: Please provide the required details
@@ -979,6 +975,10 @@ en:
     resolved: Issue status has been set to 'Resolved'
     ignored: Issue status has been set to 'Ignored'
     reopened: Issue status has been set to 'Open'
+    states:
+      ignored: Ignored
+      open: Open
+      resolved: Resolved
   reports:
     new:
       title_html: "Report %{link}"