Allow the status to be translated in the table of results

This commit is contained in:
Andy Allan 2018-02-28 10:50:27 +08:00
parent 0366c2eabb
commit 75e178e6b8
2 changed files with 6 additions and 6 deletions

View file

@ -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>

View file

@ -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}"