Merge remote-tracking branch 'upstream/pull/5382'
This commit is contained in:
commit
8595b67e05
3 changed files with 6 additions and 3 deletions
|
@ -48,7 +48,7 @@ class IssuesController < ApplicationController
|
|||
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
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
<% 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>
|
||||
|
|
|
@ -1477,7 +1477,10 @@ en:
|
|||
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"
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue