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

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

Browse source
This commit is contained in:
Tom Hughes 2024-01-09 18:56:25 +00:00
commit ddd22cdda6
4 changed files with 21 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

3
app/views/issues/_comments.html.erb
View file

@ -7,7 +7,8 @@
<div class="col"> <div class="col">
<p class="text-muted"> <p class="text-muted">
<%= t ".comment_from_html", :user_link => link_to(comment.user.display_name, user_path(comment.user)), <%= t ".comment_from_html", :user_link => link_to(comment.user.display_name, user_path(comment.user)),
:comment_created_at => l(comment.created_at.to_datetime, :format => :friendly) %> :comment_created_at => tag.time(l(comment.created_at.to_datetime, :format => :friendly),
:datetime => comment.created_at.xmlschema) %>
</p> </p>
<div class="richtext text-break"><%= comment.body.to_html %></div> <div class="richtext text-break"><%= comment.body.to_html %></div>
</div> </div>

3
app/views/issues/_reports.html.erb
View file

@ -7,7 +7,8 @@
<p class="text-muted"> <p class="text-muted">
<%= t ".reported_by_html", :category => report.category, <%= t ".reported_by_html", :category => report.category,
:user => link_to(report.user.display_name, user_path(report.user)), :user => link_to(report.user.display_name, user_path(report.user)),
:updated_at => l(report.updated_at.to_datetime, :format => :friendly) %> :updated_at => tag.time(l(report.updated_at.to_datetime, :format => :friendly),
:datetime => report.updated_at.xmlschema) %>
</p> </p>
<div class="richtext text-break"><%= report.details.to_html %></div> <div class="richtext text-break"><%= report.details.to_html %></div>
</div> </div>

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

@ -9,9 +9,20 @@
<% else %> <% else %>
| <%= t ".no_reports" %> | <%= t ".no_reports" %>
<% end %> <% end %>
| <%= t ".report_created_at", :datetime => l(@issue.created_at.to_datetime, :format => :friendly) %> | <%= t ".report_created_at_html",
<%= " | #{t('.last_resolved_at', :datetime => l(@issue.resolved_at.to_datetime, :format => :friendly))}" if @issue.resolved_at? %> :datetime => tag.time(l(@issue.created_at.to_datetime, :format => :friendly),
<%= " | #{t('.last_updated_at', :datetime => l(@issue.updated_at.to_datetime, :format => :friendly), :displayname => @issue.user_updated.display_name)}" if @issue.user_updated %> :datetime => @issue.created_at.xmlschema) %>
<% if @issue.resolved_at? %>
| <%= t ".last_resolved_at_html",
:datetime => tag.time(l(@issue.resolved_at.to_datetime, :format => :friendly),
:datetime => @issue.resolved_at.xmlschema) %>
<% end %>
<% if @issue.user_updated %>
| <%= t ".last_updated_at_html",
:datetime => tag.time(l(@issue.updated_at.to_datetime, :format => :friendly),
:datetime => @issue.updated_at.xmlschema),
:displayname => link_to(@issue.user_updated.display_name, user_path(@issue.user_updated)) %>
<% end %>
</small> </small>
</p> </p>
<nav class="secondary-actions"> <nav class="secondary-actions">

6
config/locales/en.yml
View file

@ -1439,9 +1439,9 @@ en:
one: "%{count} report" one: "%{count} report"
other: "%{count} reports" other: "%{count} reports"
no_reports: No reports no_reports: No reports
report_created_at: "First reported at %{datetime}" report_created_at_html: "First reported at %{datetime}"
last_resolved_at: "Last resolved at %{datetime}" last_resolved_at_html: "Last resolved at %{datetime}"
last_updated_at: "Last updated at %{datetime} by %{displayname}" last_updated_at_html: "Last updated at %{datetime} by %{displayname}"
resolve: Resolve resolve: Resolve
ignore: Ignore ignore: Ignore
reopen: Reopen reopen: Reopen