Merge branch 'pull/3146'

diff --git a/app/views/user_blocks/show.html.erb b/app/views/user_blocks/show.html.erb
index 52c099ee40318654f27bfc188bace36aad21dc42..0204908dd2f85de324739bfd8ad8e8b6d465da8a 100644 (file)
--- a/app/views/user_blocks/show.html.erb
+++ b/app/views/user_blocks/show.html.erb
@@ -30,6 +30,8 @@
 
 <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 ".reason" %></b></p>

diff --git a/config/locales/en.yml b/config/locales/en.yml
index b07536c2718558901dcbdcdf8e854b93ce86fa4d..eb6d0e07827dfb30bd88bbc02eff49a7612fb013 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -2611,6 +2611,7 @@ en:
       title: "%{block_on} blocked by %{block_by}"
       heading_html: "%{block_on} blocked by %{block_by}"
       created: "Created"
+      duration: "Duration"
       status: "Status"
       show: "Show"
       edit: "Edit"