cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'upstream/pull/5382'

Browse source
This commit is contained in:
Tom Hughes 2024-12-08 10:37:47 +00:00
commit 8595b67e05
3 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/issues_controller.rb
View file

@ -48,7 +48,7 @@ class IssuesController < ApplicationController
end end
def show 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 @read_reports = @issue.read_reports
@unread_reports = @issue.unread_reports @unread_reports = @issue.unread_reports
@comments = @issue.comments @comments = @issue.comments

2
app/views/issues/show.html.erb
View file

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

5
config/locales/en.yml
View file

@ -1477,7 +1477,10 @@ en:
open: Open open: Open
resolved: Resolved resolved: Resolved
show: show:
title: "%{status} Issue #%{issue_id}" title:
open: "Open Issue #%{issue_id}"
ignored: "Ignored Issue #%{issue_id}"
resolved: "Resolved Issue #%{issue_id}"
reports: reports:
one: "%{count} report" one: "%{count} report"
other: "%{count} reports" other: "%{count} reports"