Merge 3c2852daf3 into c442589593

Use pluralize for countdown in MigrationWarning module
2025-07-12 15:33:14 +00:00 · 2025-07-10 09:28:00 -04:00 · 2025-07-09 12:34:27 -04:00
1 changed files with 3 additions and 1 deletions
--- a/lib/mastodon/migration_warning.rb
+++ b/lib/mastodon/migration_warning.rb
@ -2,6 +2,8 @@

 module Mastodon
  module MigrationWarning
+    include ActionView::Helpers::TextHelper
+
    WARNING_SECONDS = 10

    DEFAULT_WARNING = <<~WARNING_MESSAGE.freeze
@ -23,7 +25,7 @@ module Mastodon

    def announce_countdown
      WARNING_SECONDS.downto(1) do |i|
-        say "Continuing in #{i} second#{'s' unless i == 1}...", true
+        say "Continuing in #{pluralize i, 'second'}}...", true
        sleep 1
      end
    end
Author	SHA1	Message	Date
Matt Jankowski	5ce01af300	Merge `3c2852daf3` into `c442589593`	2025-07-10 09:28:00 -04:00
Matt Jankowski	3c2852daf3	Use `pluralize` for countdown in `MigrationWarning` module	2025-07-09 12:34:27 -04:00