From 9df1bbd31da83d14409c5f06c76cefe4efbb6647 Mon Sep 17 00:00:00 2001 From: epriestley Date: Mon, 25 Apr 2022 14:43:18 -0700 Subject: [PATCH] Remove product literal strings in "pht()", part 16 Summary: Ref T13658. Test Plan: This plan is non-exhaustive. - Looked at config options. - Ran `bin/phd`. Maniphest Tasks: T13658 Differential Revision: https://secure.phabricator.com/D21782 --- .../config/issue/PhabricatorSetupIssue.php | 3 ++- .../option/PhabricatorAWSConfigOptions.php | 2 +- .../PhabricatorAccessLogConfigOptions.php | 22 +++++++++---------- ...PhabricatorAuthenticationConfigOptions.php | 8 +++---- .../option/PhabricatorCoreConfigOptions.php | 2 +- .../option/PhabricatorPHDConfigOptions.php | 2 +- ...ricatorDaemonManagementRestartWorkflow.php | 2 +- ...abricatorDaemonManagementStartWorkflow.php | 2 +- 8 files changed, 22 insertions(+), 21 deletions(-) diff --git a/src/applications/config/issue/PhabricatorSetupIssue.php b/src/applications/config/issue/PhabricatorSetupIssue.php index a2e9532ede..cadedfc7da 100644 --- a/src/applications/config/issue/PhabricatorSetupIssue.php +++ b/src/applications/config/issue/PhabricatorSetupIssue.php @@ -28,7 +28,8 @@ final class PhabricatorSetupIssue extends Phobject { $message = pht( "Unable to connect to MySQL!\n\n". "%s\n\n". - "Make sure Phabricator and MySQL are correctly configured.", + "Make sure databases connection information and MySQL are ". + "correctly configured.", $ex->getMessage()); $issue = id(new self()) diff --git a/src/applications/config/option/PhabricatorAWSConfigOptions.php b/src/applications/config/option/PhabricatorAWSConfigOptions.php index 5f2246fdaa..a7a3a1e2ea 100644 --- a/src/applications/config/option/PhabricatorAWSConfigOptions.php +++ b/src/applications/config/option/PhabricatorAWSConfigOptions.php @@ -42,7 +42,7 @@ final class PhabricatorAWSConfigOptions pht( 'Explicit S3 endpoint to use. This should be the endpoint '. 'which corresponds to the region you have selected in '. - '`amazon-s3.region`. Phabricator can not determine the correct '. + '`amazon-s3.region`. This software can not determine the correct '. 'endpoint automatically because some endpoint locations are '. 'irregular.')) ->addExample( diff --git a/src/applications/config/option/PhabricatorAccessLogConfigOptions.php b/src/applications/config/option/PhabricatorAccessLogConfigOptions.php index 45f730b977..0e3d336fc5 100644 --- a/src/applications/config/option/PhabricatorAccessLogConfigOptions.php +++ b/src/applications/config/option/PhabricatorAccessLogConfigOptions.php @@ -73,8 +73,8 @@ final class PhabricatorAccessLogConfigOptions ->setSummary(pht('Access log location.')) ->setDescription( pht( - "To enable the Phabricator access log, specify a path. The ". - "Phabricator access than normal HTTP access logs (for instance, ". + "To enable the HTTP access log, specify a path. This log is ". + "more detailed than normal HTTP access logs (for instance, ". "it can show logged-in users, controllers, and other application ". "data).\n\n". "If not set, no log will be written.")) @@ -82,7 +82,7 @@ final class PhabricatorAccessLogConfigOptions null, pht('Disable access log.')) ->addExample( - '/var/log/phabricator/access.log', + '/var/log/devtools/access.log', pht('Write access log here.')), $this->newOption( 'log.access.format', @@ -98,16 +98,16 @@ final class PhabricatorAccessLogConfigOptions ->setSummary(pht('SSH log location.')) ->setDescription( pht( - "To enable the Phabricator SSH log, specify a path. The ". - "access log can provide more detailed information about SSH ". - "access than a normal SSH log (for instance, it can show ". - "logged-in users, commands, and other application data).\n\n". + "To enable the SSH log, specify a path. This log can provide ". + "more detailed information about SSH access than a normal SSH ". + "log (for instance, it can show logged-in users, commands, and ". + "other application data).\n\n". "If not set, no log will be written.")) ->addExample( null, pht('Disable SSH log.')) ->addExample( - '/var/log/phabricator/ssh.log', + '/var/log/devtools/ssh.log', pht('Write SSH log here.')), $this->newOption( 'log.ssh.format', @@ -121,14 +121,14 @@ final class PhabricatorAccessLogConfigOptions ->setSummary(pht('SSH error log location.')) ->setDescription( pht( - 'To enable the Phabricator SSH error log, specify a path. Errors '. - 'occurring in contexts where Phabricator is serving SSH requests '. + 'To enable the SSH error log, specify a path. Errors occurring '. + 'in contexts where this software is serving SSH requests '. 'will be written to this log.'. "\n\n". 'If not set, no log will be written.')) ->addExample(null, pht('Disable SSH error log.')) ->addExample( - '/var/log/phabricator/ssh-error.log', + '/var/log/devtools/ssh-error.log', pht('Write SSH error log here.')), ); } diff --git a/src/applications/config/option/PhabricatorAuthenticationConfigOptions.php b/src/applications/config/option/PhabricatorAuthenticationConfigOptions.php index 8058ecafcb..976e27b324 100644 --- a/src/applications/config/option/PhabricatorAuthenticationConfigOptions.php +++ b/src/applications/config/option/PhabricatorAuthenticationConfigOptions.php @@ -44,14 +44,14 @@ final class PhabricatorAuthenticationConfigOptions pht('Require administrators to approve new accounts.')) ->setDescription( pht( - "Newly registered Phabricator accounts can either be placed ". + "Newly registered accounts can either be placed ". "into a manual approval queue for administrative review, or ". "automatically activated immediately. The approval queue is ". "enabled by default because it gives you greater control over ". - "who can register an account and access Phabricator.\n\n". + "who can register an account and access the server.\n\n". "If your install is completely public, or on a VPN, or users can ". "only register with a trusted provider like LDAP, or you've ". - "otherwise configured Phabricator to prevent unauthorized ". + "otherwise configured the server to prevent unauthorized ". "registration, you can disable the queue to reduce administrative ". "overhead.\n\n". "NOTE: Before you disable the queue, make sure ". @@ -107,7 +107,7 @@ final class PhabricatorAuthenticationConfigOptions 'This option controls whether users can edit account email '. 'addresses and profile real names.'. "\n\n". - 'If you set up Phabricator to automatically synchronize account '. + 'If you set things up to automatically synchronize account '. 'information from some other authoritative system, you can '. 'prevent users from making these edits to ensure information '. 'remains consistent across both systems.')), diff --git a/src/applications/config/option/PhabricatorCoreConfigOptions.php b/src/applications/config/option/PhabricatorCoreConfigOptions.php index 1682101659..b09c12e269 100644 --- a/src/applications/config/option/PhabricatorCoreConfigOptions.php +++ b/src/applications/config/option/PhabricatorCoreConfigOptions.php @@ -251,7 +251,7 @@ EOREMARKUP $this->newOption('phabricator.application-settings', 'wild', array()) ->setLocked(true) ->setDescription( - pht('Customized settings for Phabricator applications.')), + pht('Customized settings for applications.')), $this->newOption('phabricator.cache-namespace', 'string', 'phabricator') ->setLocked(true) ->setDescription(pht('Cache namespace.')), diff --git a/src/applications/config/option/PhabricatorPHDConfigOptions.php b/src/applications/config/option/PhabricatorPHDConfigOptions.php index 259660d562..5243bb3ee8 100644 --- a/src/applications/config/option/PhabricatorPHDConfigOptions.php +++ b/src/applications/config/option/PhabricatorPHDConfigOptions.php @@ -50,7 +50,7 @@ final class PhabricatorPHDConfigOptions pht( 'Specify a system user to run the daemons as. Primarily, this '. 'user will own the working copies of any repositories that '. - 'Phabricator imports or manages. This option is new and '. + 'this software imports or manages. This option is new and '. 'experimental.')), $this->newOption('phd.garbage-collection', 'wild', array()) ->setLocked(true) diff --git a/src/applications/daemon/management/PhabricatorDaemonManagementRestartWorkflow.php b/src/applications/daemon/management/PhabricatorDaemonManagementRestartWorkflow.php index eb2d5d229c..a9778724af 100644 --- a/src/applications/daemon/management/PhabricatorDaemonManagementRestartWorkflow.php +++ b/src/applications/daemon/management/PhabricatorDaemonManagementRestartWorkflow.php @@ -24,7 +24,7 @@ final class PhabricatorDaemonManagementRestartWorkflow 'name' => 'force', 'help' => pht( 'Stop all daemon processes on this host, even if they belong '. - 'to another Phabricator instance.'), + 'to another instance.'), ), array( 'name' => 'gently', diff --git a/src/applications/daemon/management/PhabricatorDaemonManagementStartWorkflow.php b/src/applications/daemon/management/PhabricatorDaemonManagementStartWorkflow.php index bd23d3bc7d..0aca9e5c71 100644 --- a/src/applications/daemon/management/PhabricatorDaemonManagementStartWorkflow.php +++ b/src/applications/daemon/management/PhabricatorDaemonManagementStartWorkflow.php @@ -8,7 +8,7 @@ final class PhabricatorDaemonManagementStartWorkflow ->setName('start') ->setSynopsis( pht( - 'Start the standard configured collection of Phabricator daemons. '. + 'Start the standard configured collection of daemons. '. 'This is appropriate for most installs. Use **%s** to '. 'customize which daemons are launched.', 'phd launch'))