X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/b70da7b8ea15ab48bb2f34155567cea6dffc8fc9..af637e0d92c200fcd18a370d1e460a05e9ee1a4a:/app/helpers/user_blocks_helper.rb diff --git a/app/helpers/user_blocks_helper.rb b/app/helpers/user_blocks_helper.rb index 73425edec..95b6cb600 100644 --- a/app/helpers/user_blocks_helper.rb +++ b/app/helpers/user_blocks_helper.rb @@ -26,9 +26,11 @@ module UserBlocksHelper 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