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

This commit is contained in:
Tom Hughes 2022-06-10 16:46:24 +01:00
commit ee3a943d6a
2 changed files with 2 additions and 2 deletions

View file

@ -5,7 +5,7 @@
<%= link_to user_thumbnail(comment.user), user_path(comment.user) %>
</div>
<div class="col">
<p class="text-muted mb-0">
<p class="text-muted">
<%= 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) %>
</p>

View file

@ -4,7 +4,7 @@
<%= link_to user_thumbnail(report.user), user_path(report.user) %>
</div>
<div class="col">
<p class="text-muted mb-0">
<p class="text-muted">
<%= t ".reported_by_html", :category => report.category,
:user => link_to(report.user.display_name, user_path(report.user)),
:updated_at => l(report.updated_at.to_datetime, :format => :friendly) %>