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

Merge remote-tracking branch 'openstreetmap/pull/1445'

Browse source
This commit is contained in:
Tom Hughes 2017-02-19 11:38:27 +00:00
commit 1e9a3f8664
3 changed files with 49 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)
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