From 57469db22e5a5dd0e3170c02297b27f142d4a227 Mon Sep 17 00:00:00 2001 From: epriestley Date: Mon, 25 Apr 2022 12:13:50 -0700 Subject: [PATCH] Remove product literal strings in "pht()", part 9 Summary: Ref T13658. Test Plan: This test plan is non-exhaustive. - Ran `bin/storage databases`. - Viewed Badges UI exmaples page. - Used eval rule for `strings.platform.server.name`, got "Phabricator". Maniphest Tasks: T13658 Differential Revision: https://secure.phabricator.com/D21773 --- ...PhabricatorApplicationEditHTTPParameterHelpView.php | 2 +- .../uiexample/examples/PHUIBadgeExample.php | 4 ++-- .../uiexample/examples/PHUIHovercardUIExample.php | 2 +- .../examples/PhabricatorProjectBuiltinsExample.php | 2 +- .../contentsource/PhabricatorContentSource.php | 2 +- src/infrastructure/env/PhabricatorEnv.php | 10 +++++----- .../export/format/PhabricatorExcelExportFormat.php | 3 +-- .../markup/markuprule/PhutilRemarkupEvalRule.php | 4 ++-- .../PhabricatorStorageManagementDatabasesWorkflow.php | 2 +- src/infrastructure/util/PhabricatorHash.php | 2 +- 10 files changed, 16 insertions(+), 17 deletions(-) diff --git a/src/applications/transactions/view/PhabricatorApplicationEditHTTPParameterHelpView.php b/src/applications/transactions/view/PhabricatorApplicationEditHTTPParameterHelpView.php index d21e2105fb..fafb4d35af 100644 --- a/src/applications/transactions/view/PhabricatorApplicationEditHTTPParameterHelpView.php +++ b/src/applications/transactions/view/PhabricatorApplicationEditHTTPParameterHelpView.php @@ -67,7 +67,7 @@ browser's address bar. It will usually look something like this: %s ``` -However, `your.install.com` will be the domain where your copy of Phabricator +However, `your.install.com` will be the domain where your copy of this software is installed, and `application/` will be the URI for an application. Some applications have multiple forms for creating objects or URIs that look a little different than this example, so the URI may not look exactly like this. diff --git a/src/applications/uiexample/examples/PHUIBadgeExample.php b/src/applications/uiexample/examples/PHUIBadgeExample.php index c001a3c751..40f549e305 100644 --- a/src/applications/uiexample/examples/PHUIBadgeExample.php +++ b/src/applications/uiexample/examples/PHUIBadgeExample.php @@ -56,7 +56,7 @@ final class PHUIBadgeExample extends PhabricatorUIExample { $badges2 = array(); $badges2[] = id(new PHUIBadgeView()) ->setIcon('fa-user') - ->setHeader(pht('Phabricator User')) + ->setHeader(pht('User')) ->setSubhead(pht('Confirmed your account.')) ->setQuality(PhabricatorBadgesQuality::POOR) ->setSource(pht('People (automatic)')) @@ -111,7 +111,7 @@ final class PHUIBadgeExample extends PhabricatorUIExample { $badges2[] = id(new PHUIBadgeView()) ->setIcon('fa-compass') ->setHeader(pht('Lead Developer')) - ->setSubhead(pht('Lead Developer of Phabricator')) + ->setSubhead(pht('Lead Developer of Software')) ->setQuality(PhabricatorBadgesQuality::HEIRLOOM) ->setSource(pht('Direct Award')) ->addByline(pht('Dec 31, 1969')) diff --git a/src/applications/uiexample/examples/PHUIHovercardUIExample.php b/src/applications/uiexample/examples/PHUIHovercardUIExample.php index b88fdc6639..2e68976ae0 100644 --- a/src/applications/uiexample/examples/PHUIHovercardUIExample.php +++ b/src/applications/uiexample/examples/PHUIHovercardUIExample.php @@ -39,7 +39,7 @@ final class PHUIHovercardUIExample extends PhabricatorUIExample { $task_handle = $this->createBasicDummyHandle( 'T123', ManiphestTaskPHIDType::TYPECONST, - pht('Improve Mobile Experience for Phabricator')); + pht('Improve Mobile Experience')); $tag = id(new PHUITagView()) ->setType(PHUITagView::TYPE_STATE) diff --git a/src/applications/uiexample/examples/PhabricatorProjectBuiltinsExample.php b/src/applications/uiexample/examples/PhabricatorProjectBuiltinsExample.php index 2cc89b56d5..9eb90f6de1 100644 --- a/src/applications/uiexample/examples/PhabricatorProjectBuiltinsExample.php +++ b/src/applications/uiexample/examples/PhabricatorProjectBuiltinsExample.php @@ -7,7 +7,7 @@ final class PhabricatorProjectBuiltinsExample extends PhabricatorUIExample { } public function getDescription() { - return pht('Builtin Project Images that ship with Phabricator.'); + return pht('Builtin Project Images.'); } public function getCategory() { diff --git a/src/infrastructure/contentsource/PhabricatorContentSource.php b/src/infrastructure/contentsource/PhabricatorContentSource.php index 3a5ea19f57..ee77052113 100644 --- a/src/infrastructure/contentsource/PhabricatorContentSource.php +++ b/src/infrastructure/contentsource/PhabricatorContentSource.php @@ -42,7 +42,7 @@ abstract class PhabricatorContentSource extends Phobject { } else { throw new Exception( pht( - 'Content source type "%s" is not known to Phabricator!', + 'Content source type "%s" is unknown.', $source)); } } diff --git a/src/infrastructure/env/PhabricatorEnv.php b/src/infrastructure/env/PhabricatorEnv.php index 4806289f52..352e9aeb5e 100644 --- a/src/infrastructure/env/PhabricatorEnv.php +++ b/src/infrastructure/env/PhabricatorEnv.php @@ -554,17 +554,17 @@ final class PhabricatorEnv extends Phobject { switch ($reason) { case self::READONLY_MASTERLESS: return pht( - 'Phabricator is in read-only mode (no writable database '. + 'This server is in read-only mode (no writable database '. 'is configured).'); case self::READONLY_UNREACHABLE: return pht( - 'Phabricator is in read-only mode (unreachable master).'); + 'This server is in read-only mode (unreachable master).'); case self::READONLY_SEVERED: return pht( - 'Phabricator is in read-only mode (major interruption).'); + 'This server is in read-only mode (major interruption).'); } - return pht('Phabricator is in read-only mode.'); + return pht('This server is in read-only mode.'); } public static function getReadOnlyURI() { @@ -884,7 +884,7 @@ final class PhabricatorEnv extends Phobject { if (!$cluster_addresses) { throw new Exception( pht( - 'Phabricator is not configured to serve cluster requests. '. + 'This server is not configured to serve cluster requests. '. 'Set `cluster.addresses` in the configuration to whitelist '. 'cluster hosts before sending requests that use a cluster '. 'authentication mechanism.')); diff --git a/src/infrastructure/export/format/PhabricatorExcelExportFormat.php b/src/infrastructure/export/format/PhabricatorExcelExportFormat.php index e7135bd9db..dd33813384 100644 --- a/src/infrastructure/export/format/PhabricatorExcelExportFormat.php +++ b/src/infrastructure/export/format/PhabricatorExcelExportFormat.php @@ -33,8 +33,7 @@ EOHELP return pht(<< array( 'platform' => array( 'server' => array( - 'name' => pht('Phabricator'), + 'name' => PlatformSymbols::getPlatformServerName(), 'path' => pht('phabricator/'), ), 'client' => array( - 'name' => pht('Arcanist'), + 'name' => PlatformSymbols::getPlatformClientName(), 'path' => pht('arcanist/'), ), ), diff --git a/src/infrastructure/storage/management/workflow/PhabricatorStorageManagementDatabasesWorkflow.php b/src/infrastructure/storage/management/workflow/PhabricatorStorageManagementDatabasesWorkflow.php index ef6735ec8f..00689ab5fe 100644 --- a/src/infrastructure/storage/management/workflow/PhabricatorStorageManagementDatabasesWorkflow.php +++ b/src/infrastructure/storage/management/workflow/PhabricatorStorageManagementDatabasesWorkflow.php @@ -7,7 +7,7 @@ final class PhabricatorStorageManagementDatabasesWorkflow $this ->setName('databases') ->setExamples('**databases** [__options__]') - ->setSynopsis(pht('List Phabricator databases.')); + ->setSynopsis(pht('List databases.')); } protected function isReadOnlyWorkflow() { diff --git a/src/infrastructure/util/PhabricatorHash.php b/src/infrastructure/util/PhabricatorHash.php index fdd6609288..8916b37a0e 100644 --- a/src/infrastructure/util/PhabricatorHash.php +++ b/src/infrastructure/util/PhabricatorHash.php @@ -22,7 +22,7 @@ final class PhabricatorHash extends Phobject { if (!$key) { throw new Exception( pht( - "Set a '%s' in your Phabricator configuration!", + "Set a '%s' in your configuration!", 'security.hmac-key')); } -- 2.51.2