From 5e068152143a27fbf34ed6c90773f46b59039c70 Mon Sep 17 00:00:00 2001 From: Andy Allan Date: Wed, 19 Jun 2019 12:01:39 +0200 Subject: [PATCH] Use friendly_date_ago helper for user_blocks Refs #2255 Removes two unused translations. --- app/helpers/user_blocks_helper.rb | 2 +- config/locales/en.yml | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/app/helpers/user_blocks_helper.rb b/app/helpers/user_blocks_helper.rb index ed9997f6d..9f0c4a304 100644 --- 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 - 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 diff --git a/config/locales/en.yml b/config/locales/en.yml index c560c9c98..517f419c2 100644 --- 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_past: "Ended %{time} ago." + time_past: "Ended %{time}." 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}" - time_future: "Ends in %{time}" - time_past: "Ended %{time} ago" created: "Created" ago: "%{time} ago" status: "Status" -- 2.43.2