Merge 3c2852daf3 into 74fc4dbacf

refactor: Only remove pointer-events when necessary (#35390 )
Use pluralize for countdown in MigrationWarning module
2025-07-18 10:18:24 +00:00 · 2025-07-15 17:05:58 +00:00 · 2025-07-15 15:57:31 +00:00 · 2025-07-09 12:34:27 -04:00
2 changed files with 3 additions and 3 deletions
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@ -2848,7 +2848,6 @@ a.account__display-name {
    &__pane {
      height: 100%;
      overflow: hidden;
      pointer-events: none;
      display: flex;
      justify-content: flex-end;
      min-width: 285px;
@ -2860,7 +2859,6 @@ a.account__display-name {
      &__inner {
        position: fixed;
        width: 285px;
        pointer-events: auto;
        height: 100%;
      }
    }
--- 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	8e0bec8c86	Merge `3c2852daf3` into `74fc4dbacf`	2025-07-15 17:05:58 +00:00
diondiondion	74fc4dbacf	refactor: Only remove pointer-events when necessary (#35390 ) Some checks failed Check i18n / check-i18n (push) Waiting to run Details Chromatic / Run Chromatic (push) Waiting to run Details CodeQL / Analyze (javascript) (push) Waiting to run Details CodeQL / Analyze (ruby) (push) Waiting to run Details Check formatting / lint (push) Waiting to run Details CSS Linting / lint (push) Waiting to run Details Ruby Testing / build (production) (push) Waiting to run Details Ruby Testing / build (test) (push) Waiting to run Details Ruby Testing / test (.ruby-version) (push) Blocked by required conditions Details Ruby Testing / test (3.2) (push) Blocked by required conditions Details Ruby Testing / test (3.3) (push) Blocked by required conditions Details Ruby Testing / ImageMagick tests (.ruby-version) (push) Blocked by required conditions Details Ruby Testing / ImageMagick tests (3.2) (push) Blocked by required conditions Details Ruby Testing / ImageMagick tests (3.3) (push) Blocked by required conditions Details Ruby Testing / End to End testing (.ruby-version) (push) Blocked by required conditions Details Ruby Testing / End to End testing (3.2) (push) Blocked by required conditions Details Ruby Testing / End to End testing (3.3) (push) Blocked by required conditions Details Ruby Testing / Elastic Search integration testing (.ruby-version, docker.elastic.co/elasticsearch/elasticsearch:7.17.13) (push) Blocked by required conditions Details Ruby Testing / Elastic Search integration testing (.ruby-version, docker.elastic.co/elasticsearch/elasticsearch:8.10.2) (push) Blocked by required conditions Details Ruby Testing / Elastic Search integration testing (.ruby-version, opensearchproject/opensearch:2) (push) Blocked by required conditions Details Ruby Testing / Elastic Search integration testing (3.2, docker.elastic.co/elasticsearch/elasticsearch:7.17.13) (push) Blocked by required conditions Details Ruby Testing / Elastic Search integration testing (3.3, docker.elastic.co/elasticsearch/elasticsearch:7.17.13) (push) Blocked by required conditions Details Crowdin / Upload translations / upload-translations (push) Has been cancelled Details Haml Linting / lint (push) Has been cancelled Details Ruby Linting / lint (push) Has been cancelled Details Historical data migration test / test (14-alpine) (push) Has been cancelled Details Historical data migration test / test (15-alpine) (push) Has been cancelled Details Historical data migration test / test (16-alpine) (push) Has been cancelled Details Historical data migration test / test (17-alpine) (push) Has been cancelled Details	2025-07-15 15:57:31 +00:00
Matt Jankowski	3c2852daf3	Use `pluralize` for countdown in `MigrationWarning` module	2025-07-09 12:34:27 -04:00