X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/b954416a70fb167b9cae0a3937de16bd9a93d239..edd49e85823079d6de19cbc9f89c6abc0568382b:/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 3c9c0a37e..9f0c4a304 100644 --- a/app/helpers/user_blocks_helper.rb +++ b/app/helpers/user_blocks_helper.rb @@ -7,19 +7,34 @@ module UserBlocksHelper # 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.ends_at > Time.now.getutc - I18n.t("user_block.helper.time_future_and_until_login", :time => friendly_date(block.ends_at)).html_safe + I18n.t("user_blocks.helper.time_future_and_until_login", :time => friendly_date(block.ends_at)).html_safe else - I18n.t("user_block.helper.until_login") + I18n.t("user_blocks.helper.until_login") end else - I18n.t("user_block.helper.time_future", :time => friendly_date(block.ends_at)).html_safe + I18n.t("user_blocks.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 => friendly_date(last_time)).html_safe + I18n.t("user_blocks.helper.time_past", :time => friendly_date_ago(last_time)).html_safe + end + end + + def block_duration_in_words(duration) + parts = ActiveSupport::Duration.build(duration).parts + if duration < 1.day + I18n.t("user_blocks.helper.block_duration.hours", :count => parts[:hours]) + elsif duration < 1.week + I18n.t("user_blocks.helper.block_duration.days", :count => parts[:days]) + elsif duration < 1.month + I18n.t("user_blocks.helper.block_duration.weeks", :count => parts[:weeks]) + elsif duration < 1.year + I18n.t("user_blocks.helper.block_duration.months", :count => parts[:months]) + else + I18n.t("user_blocks.helper.block_duration.years", :count => parts[:years]) end end end