cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Small improvement to block status display

Browse source
This commit is contained in:
Simon Poole 2017-02-18 18:08:25 +01:00
parent 0bdf29f10b
commit 998a84a1b4
2 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

7
app/helpers/user_blocks_helper.rb
View file

@ -4,8 +4,13 @@ module UserBlocksHelper
# user block (i.e: whether it's active, what the expiry time is) # user block (i.e: whether it's active, what the expiry time is)
def block_status(block) def block_status(block)
if block.active? 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? 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 else
I18n.t("user_block.helper.time_future", :time => friendly_date(block.ends_at)).html_safe I18n.t("user_block.helper.time_future", :time => friendly_date(block.ends_at)).html_safe
end end

1
config/locales/en.yml
View file

@ -2112,6 +2112,7 @@ en:
helper: helper:
time_future: "Ends in %{time}." time_future: "Ends in %{time}."
until_login: "Active until the user logs in." 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." time_past: "Ended %{time} ago."
blocks_on: blocks_on:
title: "Blocks on %{name}" title: "Blocks on %{name}"