From 998a84a1b4e05b348c9bc3bf32cc10eea47c099a Mon Sep 17 00:00:00 2001 From: Simon Poole Date: Sat, 18 Feb 2017 18:08:25 +0100 Subject: [PATCH] Small improvement to block status display --- app/helpers/user_blocks_helper.rb | 7 ++++++- config/locales/en.yml | 1 + 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/app/helpers/user_blocks_helper.rb b/app/helpers/user_blocks_helper.rb index 282d9164a..3c9c0a37e 100644 --- a/app/helpers/user_blocks_helper.rb +++ b/app/helpers/user_blocks_helper.rb @@ -4,8 +4,13 @@ module UserBlocksHelper # user block (i.e: whether it's active, what the expiry time is) def block_status(block) if block.active? + # if the block hasn't expired yet show the date, if the user just needs to login show that if block.needs_view? - I18n.t("user_block.helper.until_login") + if block.ends_at > Time.now.getutc + I18n.t("user_block.helper.time_future_and_until_login", :time => friendly_date(block.ends_at)).html_safe + else + I18n.t("user_block.helper.until_login") + end else I18n.t("user_block.helper.time_future", :time => friendly_date(block.ends_at)).html_safe end diff --git a/config/locales/en.yml b/config/locales/en.yml index b2ebffd61..757e74e63 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -2112,6 +2112,7 @@ en: helper: time_future: "Ends in %{time}." until_login: "Active until the user logs in." + time_future_and_until_login: "Expires in %{time} and requires the user to login." time_past: "Ended %{time} ago." blocks_on: title: "Blocks on %{name}" -- 2.39.5