X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/34e3e51456774127d43408b7ab65c24f41373f62..dfbb95270782d4a290b77b7b513b5b7d9d52732a:/app/helpers/user_blocks_helper.rb?ds=sidebyside diff --git a/app/helpers/user_blocks_helper.rb b/app/helpers/user_blocks_helper.rb index f645d360b..3c9c0a37e 100644 --- a/app/helpers/user_blocks_helper.rb +++ b/app/helpers/user_blocks_helper.rb @@ -4,17 +4,22 @@ 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 => distance_of_time_in_words_to_now(block.ends_at)) + I18n.t("user_block.helper.time_future", :time => friendly_date(block.ends_at)).html_safe end else # the max of the last update time or the ends_at time is when this block finished # 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_block.helper.time_past', :time => distance_of_time_in_words_to_now(last_time)) + I18n.t("user_block.helper.time_past", :time => friendly_date(last_time)).html_safe end end end