From: Andy Allan <git@gravitystorm.co.uk>
Date: Wed, 28 Apr 2021 15:03:57 +0000 (+0100)
Subject: Merge branch 'pull/3146'
X-Git-Tag: live~2113
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/dbf35e0cf67ee330cd02c2431e0ed6d08681d184?hp=8ecb53b8692cbaac262fba5b1baa632d7cef5353

Merge branch 'pull/3146'
---

diff --git a/app/views/user_blocks/show.html.erb b/app/views/user_blocks/show.html.erb
index 52c099ee4..0204908dd 100644
--- 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 b07536c27..eb6d0e078 100644
--- 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"