Use friendly_date_ago helper for user_blocks

Refs #2255

Removes two unused translations.

diff --git a/app/helpers/user_blocks_helper.rb b/app/helpers/user_blocks_helper.rb
index ed9997f6d778f7744a66d8ab02abe3c28c6ddb1d..9f0c4a3040abd98196195d850d55857ed72fe15e 100644 (file)
--- a/app/helpers/user_blocks_helper.rb
+++ b/app/helpers/user_blocks_helper.rb
@@ -19,7 +19,7 @@ module UserBlocksHelper
       # 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
       # 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_blocks.helper.time_past", :time => friendly_date(last_time)).html_safe
+      I18n.t("user_blocks.helper.time_past", :time => friendly_date_ago(last_time)).html_safe

     end
   end
 
     end
   end
 

diff --git a/config/locales/en.yml b/config/locales/en.yml
index c560c9c98ae9cfbbeb6d9887ab141fae6d2c1e30..517f419c217a0f2532abca11a3e934533348b569 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -2372,7 +2372,7 @@ en:
       time_future: "Ends in %{time}."
       until_login: "Active until the user logs in."
       time_future_and_until_login: "Ends in %{time} and after the user has logged in."
       time_future: "Ends in %{time}."
       until_login: "Active until the user logs in."
       time_future_and_until_login: "Ends in %{time} and after the user has logged in."

-      time_past: "Ended %{time} ago."
+      time_past: "Ended %{time}."

       block_duration:
         hours:
           one: "1 hour"
       block_duration:
         hours:
           one: "1 hour"


@@ -2400,8 +2400,6 @@ en:
     show:
       title: "%{block_on} blocked by %{block_by}"
       heading: "%{block_on} blocked by %{block_by}"
     show:
       title: "%{block_on} blocked by %{block_by}"
       heading: "%{block_on} blocked by %{block_by}"

-      time_future: "Ends in %{time}"
-      time_past: "Ended %{time} ago"

       created: "Created"
       ago: "%{time} ago"
       status: "Status"
       created: "Created"
       ago: "%{time} ago"
       status: "Status"