From 46761798797638a4ef8c35b3bf8e5b1ee83e263f Mon Sep 17 00:00:00 2001
From: Tom Hughes <tom@compton.nu>
Date: Thu, 25 Jun 2015 17:44:20 +0100
Subject: [PATCH] Improve display of user block timestamps

Display the creation time, as a friendly date with a tooltip for
the exact time, and add a tooltip to the expiry time.

Fixes #923 and #996
---
 app/helpers/user_blocks_helper.rb   | 4 ++--
 app/views/user_blocks/show.html.erb | 2 ++
 config/locales/en.yml               | 2 ++
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/helpers/user_blocks_helper.rb b/app/helpers/user_blocks_helper.rb
index b6d4a9a9f..282d9164a 100644
--- a/app/helpers/user_blocks_helper.rb
+++ b/app/helpers/user_blocks_helper.rb
@@ -7,14 +7,14 @@ module UserBlocksHelper
       if block.needs_view?
         I18n.t("user_block.helper.until_login")
       else
-        I18n.t("user_block.helper.time_future", :time => distance_of_time_in_words_to_now(block.ends_at))
+        I18n.t("user_block.helper.time_future", :time => friendly_date(block.ends_at)).html_safe
       end
     else
       # the max of the last update time or the ends_at time is when this block finished
       # either because the user viewed the block (updated_at) or it expired or was
       # revoked (ends_at)
       last_time = [block.ends_at, block.updated_at].max
-      I18n.t("user_block.helper.time_past", :time => distance_of_time_in_words_to_now(last_time))
+      I18n.t("user_block.helper.time_past", :time => friendly_date(last_time)).html_safe
     end
   end
 end
diff --git a/app/views/user_blocks/show.html.erb b/app/views/user_blocks/show.html.erb
index e882e6e3b..ccd6df06f 100644
--- a/app/views/user_blocks/show.html.erb
+++ b/app/views/user_blocks/show.html.erb
@@ -30,6 +30,8 @@
 </p>
 <% end %>
 
+<p><b><%= t'user_block.show.created' %></b>: <%= raw t'user_block.show.ago', :time => friendly_date(@user_block.created_at) %></p>
+
 <p><b><%= t'user_block.show.status' %></b>: <%= block_status(@user_block) %></p>
 
 <p><b><%= t'user_block.show.reason' %></b></p>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 6c5c23da0..0a6f108e7 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -2112,6 +2112,8 @@ en:
       heading: "%{block_on} blocked by %{block_by}"
       time_future: "Ends in %{time}"
       time_past: "Ended %{time} ago"
+      created: "Created"
+      ago: "%{time} ago"
       status: "Status"
       show: "Show"
       edit: "Edit"
-- 
2.39.5