From 2f4ac2a8040a554493cf8dedcb7342a0504df1e5 Mon Sep 17 00:00:00 2001 From: epriestley Date: Mon, 25 Apr 2022 16:07:58 -0700 Subject: [PATCH] Remove product literal strings in "pht()", part 19 Summary: Ref T13658. Test Plan: Static checks only. Subscribers: PHID-OPKG-gm6ozazyms6q6i22gyam Maniphest Tasks: T13658 Differential Revision: https://secure.phabricator.com/D21785 --- .../doorkeeper/worker/DoorkeeperAsanaFeedWorker.php | 5 +++-- .../drydock/operation/DrydockLandRepositoryOperation.php | 9 +++++---- .../files/config/PhabricatorFilesConfigOptions.php | 2 +- .../files/controller/PhabricatorFileUploadController.php | 2 +- .../harbormaster/artifact/HarbormasterFileArtifact.php | 3 +-- .../controller/HarbormasterPlanRunController.php | 2 +- .../customfield/HarbormasterBuildStepCoreCustomField.php | 4 ++-- 7 files changed, 14 insertions(+), 13 deletions(-) diff --git a/src/applications/doorkeeper/worker/DoorkeeperAsanaFeedWorker.php b/src/applications/doorkeeper/worker/DoorkeeperAsanaFeedWorker.php index bbc619ae51..8648f5d7f9 100644 --- a/src/applications/doorkeeper/worker/DoorkeeperAsanaFeedWorker.php +++ b/src/applications/doorkeeper/worker/DoorkeeperAsanaFeedWorker.php @@ -512,9 +512,10 @@ final class DoorkeeperAsanaFeedWorker extends DoorkeeperFeedWorker { private function getSynchronizationWarning() { return pht( "\xE2\x9A\xA0 DO NOT EDIT THIS TASK \xE2\x9A\xA0\n". - "\xE2\x98\xA0 Your changes will not be reflected in Phabricator.\n". + "\xE2\x98\xA0 Your changes will not be reflected in %s.\n". "\xE2\x98\xA0 Your changes will be destroyed the next time state ". - "is synchronized."); + "is synchronized.", + PlatformSymbols::getPlatformServerName()); } private function lookupAsanaUserIDs($all_phids) { diff --git a/src/applications/drydock/operation/DrydockLandRepositoryOperation.php b/src/applications/drydock/operation/DrydockLandRepositoryOperation.php index acb48f6f0b..f44d6a1db2 100644 --- a/src/applications/drydock/operation/DrydockLandRepositoryOperation.php +++ b/src/applications/drydock/operation/DrydockLandRepositoryOperation.php @@ -391,7 +391,7 @@ final class DrydockLandRepositoryOperation 'title' => pht('Staging Unavailable'), 'body' => pht( 'When this diff was generated, the server was running an older '. - 'version of Phabricator which did not support staging areas, so '. + 'version of the software which did not support staging areas, so '. 'the change was not pushed to staging. Changes must be pushed '. 'to staging before they can be landed from the web.'), ); @@ -400,7 +400,7 @@ final class DrydockLandRepositoryOperation 'title' => pht('Repository Unsupported'), 'body' => pht( 'When this diff was generated, the server was running an older '. - 'version of Phabricator which did not support staging areas for '. + 'version of the software which did not support staging areas for '. 'this version control system, so the change was not pushed to '. 'staging. Changes must be pushed to staging before they can be '. 'landed from the web.'), @@ -432,8 +432,9 @@ final class DrydockLandRepositoryOperation 'When this diff was generated, it was not pushed to staging for '. 'an unknown reason (the status code was "%s"). Changes must be '. 'pushed to staging before they can be landed from the web. '. - 'The server may be running an out-of-date version of Phabricator, '. - 'and updating may provide more information about this error.', + 'The server may be running an out-of-date version of this '. + 'software, and updating may provide more information about this '. + 'error.', $status), ); } diff --git a/src/applications/files/config/PhabricatorFilesConfigOptions.php b/src/applications/files/config/PhabricatorFilesConfigOptions.php index 735ddfcb0d..7ed96a412b 100644 --- a/src/applications/files/config/PhabricatorFilesConfigOptions.php +++ b/src/applications/files/config/PhabricatorFilesConfigOptions.php @@ -181,7 +181,7 @@ final class PhabricatorFilesConfigOptions ->setSummary(pht('Local storage disk path.')) ->setDescription( pht( - "Phabricator provides a local disk storage engine, which just ". + "This software provides a local disk storage engine, which just ". "writes files to some directory on local disk. The webserver ". "must have read/write permissions on this directory. This is ". "straightforward and suitable for most installs, but will not ". diff --git a/src/applications/files/controller/PhabricatorFileUploadController.php b/src/applications/files/controller/PhabricatorFileUploadController.php index c06e0e6d89..dfc4696e08 100644 --- a/src/applications/files/controller/PhabricatorFileUploadController.php +++ b/src/applications/files/controller/PhabricatorFileUploadController.php @@ -46,7 +46,7 @@ final class PhabricatorFileUploadController extends PhabricatorFileController { pht('Drag and Drop:'), pht( 'You can also upload files by dragging and dropping them from your '. - 'desktop onto this page or the Phabricator home page.'))); + 'desktop onto this page or the home page.'))); $policies = id(new PhabricatorPolicyQuery()) ->setViewer($viewer) diff --git a/src/applications/harbormaster/artifact/HarbormasterFileArtifact.php b/src/applications/harbormaster/artifact/HarbormasterFileArtifact.php index 91fc025c21..6b536d8efa 100644 --- a/src/applications/harbormaster/artifact/HarbormasterFileArtifact.php +++ b/src/applications/harbormaster/artifact/HarbormasterFileArtifact.php @@ -10,8 +10,7 @@ final class HarbormasterFileArtifact extends HarbormasterArtifact { public function getArtifactTypeDescription() { return pht( - 'Stores a reference to file data which has been uploaded to '. - 'Phabricator.'); + 'Stores a reference to file data.'); } public function getArtifactParameterSpecification() { diff --git a/src/applications/harbormaster/controller/HarbormasterPlanRunController.php b/src/applications/harbormaster/controller/HarbormasterPlanRunController.php index 5d80d421aa..cfa27fec1d 100644 --- a/src/applications/harbormaster/controller/HarbormasterPlanRunController.php +++ b/src/applications/harbormaster/controller/HarbormasterPlanRunController.php @@ -84,7 +84,7 @@ final class HarbormasterPlanRunController extends HarbormasterPlanController { "example, `rX123456` or `D123`).\n\n". "For more detailed output, you can also run manual builds from ". "the command line:\n\n". - " phabricator/ $ ./bin/harbormaster build --plan %s", + " $ ./bin/harbormaster build --plan %s", $plan->getID())) ->appendChild( id(new AphrontFormTextControl()) diff --git a/src/applications/harbormaster/customfield/HarbormasterBuildStepCoreCustomField.php b/src/applications/harbormaster/customfield/HarbormasterBuildStepCoreCustomField.php index 6f8fe28c6e..c83ae46086 100644 --- a/src/applications/harbormaster/customfield/HarbormasterBuildStepCoreCustomField.php +++ b/src/applications/harbormaster/customfield/HarbormasterBuildStepCoreCustomField.php @@ -30,8 +30,8 @@ final class HarbormasterBuildStepCoreCustomField 'After completing this build step Harbormaster can continue the '. 'build normally, or it can pause the build and wait for a message. '. 'If you are using this build step to trigger some work in an '. - 'external system, you may want to have Phabricator wait for that '. - 'system to perform the work and report results back.'. + 'external system, you may want wait for that system to perform '. + 'the work and report results back.'. "\n\n". 'If you select **Continue Build Normally**, the build plan will '. 'proceed once this step finishes.'.