Use friendly_date helpers for revoking user blocks

diff --git a/app/views/user_blocks/revoke.html.erb b/app/views/user_blocks/revoke.html.erb
index 9a86177fc7dedcb030f3bb94f29f7186600a185e..eb1cc4cbebb4e9414043f828b753f03577ba25f8 100644 (file)
--- a/app/views/user_blocks/revoke.html.erb
+++ b/app/views/user_blocks/revoke.html.erb
@@ -12,7 +12,7 @@
 
 <% if @user_block.ends_at > Time.now %>
   <p>
 
 <% if @user_block.ends_at > Time.now %>
   <p>

-    <%= t(".time_future", :time => distance_of_time_in_words_to_now(@user_block.ends_at)) %>
+    <%= t(".time_future_html", :time => friendly_date(@user_block.ends_at)) %>

   </p>
 
   <%= bootstrap_form_for :revoke, :url => { :action => "revoke" } do |f| %>
   </p>
 
   <%= bootstrap_form_for :revoke, :url => { :action => "revoke" } do |f| %>


@@ -28,6 +28,6 @@
 
 <% else %>
   <p>
 
 <% else %>
   <p>

-    <%= t(".past", :time => time_ago_in_words(@user_block.ends_at, :scope => :"datetime.distance_in_words_ago")) %>
+    <%= t(".past_html", :time => friendly_date_ago(@user_block.ends_at)) %>

   </p>
 <% end %>
   </p>
 <% end %>

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 379e02f66be1208cc720c6a0a27f3963b465ea13..079f525a00485ceee99261aeff27b0b829f09e1b 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -2844,8 +2844,8 @@ en:
     revoke:
       title: "Revoking block on %{block_on}"
       heading_html: "Revoking block on %{block_on} by %{block_by}"
     revoke:
       title: "Revoking block on %{block_on}"
       heading_html: "Revoking block on %{block_on} by %{block_by}"

-      time_future: "This block will end in %{time}."
-      past: "This block ended %{time} and cannot be revoked now."
+      time_future_html: "This block will end in %{time}."
+      past_html: "This block ended %{time} and cannot be revoked now."

       confirm: "Are you sure you wish to revoke this block?"
       revoke: "Revoke!"
       flash: "This block has been revoked."
       confirm: "Are you sure you wish to revoke this block?"
       revoke: "Revoke!"
       flash: "This block has been revoked."