X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/90ac07d071ed8dbfdea6214419e1b5205a529b2f..0d3382015025b1a930a4667bde03f4b26003904b:/app/helpers/user_blocks_helper.rb diff --git a/app/helpers/user_blocks_helper.rb b/app/helpers/user_blocks_helper.rb index ed9997f6d..3a55e1cde 100644 --- a/app/helpers/user_blocks_helper.rb +++ b/app/helpers/user_blocks_helper.rb @@ -1,4 +1,6 @@ module UserBlocksHelper + include ActionView::Helpers::TranslationHelper + ## # returns a translated string representing the status of the # user block (i.e: whether it's active, what the expiry time is) @@ -6,35 +8,37 @@ 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 - I18n.t("user_blocks.helper.time_future_and_until_login", :time => friendly_date(block.ends_at)).html_safe + if block.ends_at > Time.now.utc + t("user_blocks.helper.time_future_and_until_login_html", :time => friendly_date(block.ends_at)) else - I18n.t("user_blocks.helper.until_login") + t("user_blocks.helper.until_login") end else - I18n.t("user_blocks.helper.time_future", :time => friendly_date(block.ends_at)).html_safe + t("user_blocks.helper.time_future_html", :time => friendly_date(block.ends_at)) 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_blocks.helper.time_past", :time => friendly_date(last_time)).html_safe + 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 - I18n.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 - I18n.t("user_blocks.helper.block_duration.days", :count => parts[:days]) + 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]) + 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]) + t("user_blocks.helper.block_duration.months", :count => parts[:months]) else - I18n.t("user_blocks.helper.block_duration.years", :count => parts[:years]) + t("user_blocks.helper.block_duration.years", :count => parts[:years]) end end end