X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/847536c80dbd1f8a0b4e0c0f803e80407e00e4b1..387ecce798585022ffac69d28ae703c737c36f3b:/app/helpers/user_blocks_helper.rb

diff --git a/app/helpers/user_blocks_helper.rb b/app/helpers/user_blocks_helper.rb
index 73425edec..3a55e1cde 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")
@@ -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