From: Tom Hughes <tom@compton.nu>
Date: Wed, 9 Jun 2021 16:46:45 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/3217'
X-Git-Tag: live~2599
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/3fff377b009ea751bbfc106f079e7a73db8bffb2?hp=63c82ed72f133d9f670c0b1bb03ffd44095f6867

Merge remote-tracking branch 'upstream/pull/3217'
---

diff --git a/app/assets/images/key/cyclemap/cycleway_regional.png b/app/assets/images/key/cyclemap/cycleway_regional.png
index 7e3306e46..92249992e 100644
Binary files a/app/assets/images/key/cyclemap/cycleway_regional.png and b/app/assets/images/key/cyclemap/cycleway_regional.png differ
diff --git a/app/assets/images/key/cyclemap/cycleway_regional13.png b/app/assets/images/key/cyclemap/cycleway_regional13.png
index 9b3409fdf..519570454 100644
Binary files a/app/assets/images/key/cyclemap/cycleway_regional13.png and b/app/assets/images/key/cyclemap/cycleway_regional13.png differ
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
diff --git a/test/helpers/user_blocks_helper_test.rb b/test/helpers/user_blocks_helper_test.rb
index 16f83ec89..c4afa6c83 100644
--- a/test/helpers/user_blocks_helper_test.rb
+++ b/test/helpers/user_blocks_helper_test.rb
@@ -13,4 +13,24 @@ class UserBlocksHelperTest < ActionView::TestCase
     block = create(:user_block, :ends_at => Time.now.getutc + 1.hour)
     assert_match %r{^Ends in <span title=".*">about 1 hour</span>\.$}, block_status(block)
   end
+
+  def test_block_duration_in_words
+    words = block_duration_in_words(364.days)
+    assert_equal "11 months", words
+
+    words = block_duration_in_words(24.hours)
+    assert_equal "1 day", words
+
+    # Ensure that nil hours is not passed to i18n.t
+    words = block_duration_in_words(10.minutes)
+    assert_equal "0 hours", words
+
+    words = block_duration_in_words(0)
+    assert_equal "0 hours", words
+
+    # Ensure that (slightly) negative durations don't mess everything up
+    # This can happen on zero hour blocks when ends_at is a millisecond before created_at
+    words = block_duration_in_words(-0.001)
+    assert_equal "0 hours", words
+  end
 end