Merge branch 'pull/3146'
This commit is contained in:
commit
dbf35e0cf6
2 changed files with 3 additions and 0 deletions
|
@ -30,6 +30,8 @@
|
||||||
|
|
||||||
<p><b><%= t ".created" %></b>: <%= friendly_date_ago(@user_block.created_at) %></p>
|
<p><b><%= t ".created" %></b>: <%= friendly_date_ago(@user_block.created_at) %></p>
|
||||||
|
|
||||||
|
<p><b><%= t ".duration" %></b>: <%= block_duration_in_words(@user_block.ends_at - @user_block.created_at) %></p>
|
||||||
|
|
||||||
<p><b><%= t ".status" %></b>: <%= block_status(@user_block) %></p>
|
<p><b><%= t ".status" %></b>: <%= block_status(@user_block) %></p>
|
||||||
|
|
||||||
<p><b><%= t ".reason" %></b></p>
|
<p><b><%= t ".reason" %></b></p>
|
||||||
|
|
|
@ -2611,6 +2611,7 @@ en:
|
||||||
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"
|
||||||
status: "Status"
|
status: "Status"
|
||||||
show: "Show"
|
show: "Show"
|
||||||
edit: "Edit"
|
edit: "Edit"
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue