From 40f95f9890d194876ad55cf2f39118056a9de820 Mon Sep 17 00:00:00 2001 From: Pppery Date: Thu, 11 Dec 2025 17:52:42 -0500 Subject: [PATCH] Fix wrong proto-English string for actions with no effect Summary: The %s is the number of actions with no effect, not the total number of actions. Test Plan: - Switch locale to "raw strings" - Apply two actions one of which has no effect. - Without this patch see "Some of your 1 action(s) have no effect" which is wrong because you have 2 total actions. - With this patch see "1 of your actions has no effect". - Switch locale to US english and see the same things with and without the patch Note that it's logically impossible for you to be making only one action here; at least one must have no effect (for the message to make sense), and at least one must have some effect (or else it prints a different message). Reviewers: O1 Blessed Committers, aklapper Reviewed By: O1 Blessed Committers, aklapper Subscribers: aklapper, tobiaswiese, valerio.bozzolan, Matthew, Cigaryno Differential Revision: https://we.phorge.it/D26575 --- .../PhabricatorApplicationTransactionNoEffectResponse.php | 2 +- .../translation/PhabricatorUSEnglishTranslation.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/applications/transactions/response/PhabricatorApplicationTransactionNoEffectResponse.php b/src/applications/transactions/response/PhabricatorApplicationTransactionNoEffectResponse.php index c4f6defc21..34183a19d9 100644 --- a/src/applications/transactions/response/PhabricatorApplicationTransactionNoEffectResponse.php +++ b/src/applications/transactions/response/PhabricatorApplicationTransactionNoEffectResponse.php @@ -36,7 +36,7 @@ final class PhabricatorApplicationTransactionNoEffectResponse if ($ex->hasAnyEffect()) { $title = pht('%s Action(s) With No Effect', $count); - $head = pht('Some of your %s action(s) have no effect:', $count); + $head = pht('%s of your actions have no effect:', $count); $tail = pht('Apply remaining actions?'); $continue = pht('Apply Remaining Actions'); } else if ($ex->hasComment()) { diff --git a/src/infrastructure/internationalization/translation/PhabricatorUSEnglishTranslation.php b/src/infrastructure/internationalization/translation/PhabricatorUSEnglishTranslation.php index 220194d103..51bcfb064d 100644 --- a/src/infrastructure/internationalization/translation/PhabricatorUSEnglishTranslation.php +++ b/src/infrastructure/internationalization/translation/PhabricatorUSEnglishTranslation.php @@ -36,7 +36,7 @@ final class PhabricatorUSEnglishTranslation 'Actions With No Effect', ), - 'Some of your %s action(s) have no effect:' => array( + '%s of your actions have no effect:' => array( 'One of your actions has no effect:', 'Some of your actions have no effect:', ), -- 2.51.2