Don't interpolate type in issue title

diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb
index 516fb68ce407cb79fb379ec63046def5f28a0c52..5cedb3c705b5eeaeb42647057cb8de3c3cec7c8b 100644 (file)
--- a/app/controllers/issues_controller.rb
+++ b/app/controllers/issues_controller.rb
@@ -48,7 +48,7 @@ class IssuesController < ApplicationController
   end
 
   def show
   end
 
   def show

-    @title = t ".title", :status => @issue.status.humanize, :issue_id => @issue.id
+    @title = t ".title.#{@issue.status}", :issue_id => @issue.id

     @read_reports = @issue.read_reports
     @unread_reports = @issue.unread_reports
     @comments = @issue.comments
     @read_reports = @issue.read_reports
     @unread_reports = @issue.unread_reports
     @comments = @issue.comments

diff --git a/app/views/issues/show.html.erb b/app/views/issues/show.html.erb
index a58b8c5cb18b4f36c4bb1c0bf978618dc08b0255..74e7c0a4ce1f7793880c542da15d021a743c1ebc 100644 (file)
--- a/app/views/issues/show.html.erb
+++ b/app/views/issues/show.html.erb
@@ -1,5 +1,5 @@
 <% content_for :heading do %>
 <% content_for :heading do %>

-<h1><%= t ".title", :status => @issue.status.humanize, :issue_id => @issue.id %></h1>
+<h1><%= @title %></h1>

 <p><%= @issue.reportable.model_name.human %> : <%= link_to reportable_title(@issue.reportable), reportable_url(@issue.reportable) %></p>
 <p class="text-body-secondary">
   <small>
 <p><%= @issue.reportable.model_name.human %> : <%= link_to reportable_title(@issue.reportable), reportable_url(@issue.reportable) %></p>
 <p class="text-body-secondary">
   <small>

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 29c416c76acab7ddcbab9419c34caf14f7663f0e..c423de766639981d375023147fe282ac9e8115c8 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1477,7 +1477,10 @@ en:
         open: Open
         resolved: Resolved
     show:
         open: Open
         resolved: Resolved
     show:

-      title: "%{status} Issue #%{issue_id}"
+      title:
+        open: "Open Issue #%{issue_id}"
+        ignored: "Ignored Issue #%{issue_id}"
+        resolved: "Resolved Issue #%{issue_id}"

       reports:
         one: "%{count} report"
         other: "%{count} reports"
       reports:
         one: "%{count} report"
         other: "%{count} reports"