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

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

Browse source
This commit is contained in:
Tom Hughes 2021-04-28 18:59:34 +01:00
commit b0c90ed2b4
2 changed files with 17 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

28
app/views/user_blocks/show.html.erb
View file

@ -21,18 +21,18 @@
</ul> </ul>
<% end %> <% end %>
<% if @user_block.revoker %> <dl class="row">
<p> <% if @user_block.revoker %>
<b><%= t ".revoker" %></b> <dt class="col-sm-3"><%= t ".revoker" %></dt>
<%= link_to @user_block.revoker.display_name, user_path(@user_block.revoker) %> <dd class="col-sm-9"><%= link_to @user_block.revoker.display_name, user_path(@user_block.revoker) %></dd>
</p> <% end %>
<% end %>
<p><b><%= t ".created" %></b>: <%= friendly_date_ago(@user_block.created_at) %></p> <dt class="col-sm-3"><%= t ".created" %></dt>
<dd class="col-sm-9"><%= friendly_date_ago(@user_block.created_at) %></dd>
<p><b><%= t ".duration" %></b>: <%= block_duration_in_words(@user_block.ends_at - @user_block.created_at) %></p> <dt class="col-sm-3"><%= t ".duration" %></dt>
<dd class="col-sm-9"><%= block_duration_in_words(@user_block.ends_at - @user_block.created_at) %></dd>
<p><b><%= t ".status" %></b>: <%= block_status(@user_block) %></p> <dt class="col-sm-3"><%= t ".status" %></dt>
<dd class="col-sm-9"><%= block_status(@user_block) %></dd>
<p><b><%= t ".reason" %></b></p> <dt class="col-sm-3"><%= t ".reason" %></dt>
<div class="richtext text-break"><%= @user_block.reason.to_html %></div> <dd class="col-sm-9"><div class="richtext text-break"><%= @user_block.reason.to_html %></div></dd>
</dl>

6
config/locales/en.yml
View file

@ -2610,9 +2610,9 @@ en:
show: show:
title: "%{block_on} blocked by %{block_by}" title: "%{block_on} blocked by %{block_by}"
heading_html: "%{block_on} blocked by %{block_by}" heading_html: "%{block_on} blocked by %{block_by}"
created: "Created" created: "Created:"
duration: "Duration" duration: "Duration:"
status: "Status" status: "Status:"
show: "Show" show: "Show"
edit: "Edit" edit: "Edit"
revoke: "Revoke!" revoke: "Revoke!"