X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/b70da7b8ea15ab48bb2f34155567cea6dffc8fc9..664aaeee381064718120862db96ebf383216fdcd:/app/helpers/user_blocks_helper.rb diff --git a/app/helpers/user_blocks_helper.rb b/app/helpers/user_blocks_helper.rb index 73425edec..e2770eb69 100644 --- a/app/helpers/user_blocks_helper.rb +++ b/app/helpers/user_blocks_helper.rb @@ -8,7 +8,7 @@ module UserBlocksHelper 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.ends_at > Time.now.getutc + if block.ends_at > Time.now.utc t("user_blocks.helper.time_future_and_until_login_html", :time => friendly_date(block.ends_at)) else t("user_blocks.helper.until_login") @@ -20,15 +20,17 @@ module UserBlocksHelper # 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 + last_time = block.deactivates_at || [block.ends_at, block.updated_at].max t("user_blocks.helper.time_past_html", :time => friendly_date_ago(last_time)) end end def block_duration_in_words(duration) + # Ensure the requested duration isn't negative, even by a millisecond + duration = 0 if duration.negative? parts = ActiveSupport::Duration.build(duration).parts if duration < 1.day - t("user_blocks.helper.block_duration.hours", :count => parts[:hours]) + t("user_blocks.helper.block_duration.hours", :count => parts.fetch(:hours, 0)) elsif duration < 1.week t("user_blocks.helper.block_duration.days", :count => parts[:days]) elsif duration < 1.month