From 27b512e2849653a5f9990e92b12e67b03f77bb5c Mon Sep 17 00:00:00 2001 From: epriestley Date: Mon, 25 Apr 2022 16:30:02 -0700 Subject: [PATCH] Remove product literal strings in "pht()", part 25 Summary: Ref T13658. Test Plan: Static checks only. Maniphest Tasks: T13658 Differential Revision: https://secure.phabricator.com/D21791 --- ...PhabricatorStorageManagementDestroyWorkflow.php | 3 ++- .../PhabricatorStorageManagementDumpWorkflow.php | 2 +- ...bricatorStorageManagementQuickstartWorkflow.php | 2 +- ...PhabricatorStorageManagementUpgradeWorkflow.php | 4 ++-- .../PhabricatorStorageManagementWorkflow.php | 24 ++++++++++++---------- .../util/password/PhabricatorPasswordHasher.php | 2 +- src/view/page/PhabricatorStandardPageView.php | 2 +- 7 files changed, 21 insertions(+), 18 deletions(-) diff --git a/src/infrastructure/storage/management/workflow/PhabricatorStorageManagementDestroyWorkflow.php b/src/infrastructure/storage/management/workflow/PhabricatorStorageManagementDestroyWorkflow.php index 9b718e231d..d9ad8b8375 100644 --- a/src/infrastructure/storage/management/workflow/PhabricatorStorageManagementDestroyWorkflow.php +++ b/src/infrastructure/storage/management/workflow/PhabricatorStorageManagementDestroyWorkflow.php @@ -47,9 +47,10 @@ final class PhabricatorStorageManagementDestroyWorkflow } else { $warning = pht( 'Are you completely sure you really want to permanently destroy '. - 'all storage for Phabricator data on host "%s"? This operation '. + 'all storage for %s data on host "%s"? This operation '. 'can not be undone and your data will not be recoverable if '. 'you proceed.', + PlatformSymbols::getPlatformServerName(), $host_display); echo tsprintf( diff --git a/src/infrastructure/storage/management/workflow/PhabricatorStorageManagementDumpWorkflow.php b/src/infrastructure/storage/management/workflow/PhabricatorStorageManagementDumpWorkflow.php index aab4701bbf..8cc5b1ae63 100644 --- a/src/infrastructure/storage/management/workflow/PhabricatorStorageManagementDumpWorkflow.php +++ b/src/infrastructure/storage/management/workflow/PhabricatorStorageManagementDumpWorkflow.php @@ -161,7 +161,7 @@ final class PhabricatorStorageManagementDumpWorkflow throw new PhutilArgumentUsageException( pht( 'Database "%s" is unknown. This script can only dump '. - 'databases known to the current version of Phabricator. '. + 'databases known to the current version of this software. '. 'Valid databases are: %s.', $filter, implode(', ', array_keys($internal_names)))); diff --git a/src/infrastructure/storage/management/workflow/PhabricatorStorageManagementQuickstartWorkflow.php b/src/infrastructure/storage/management/workflow/PhabricatorStorageManagementQuickstartWorkflow.php index e181063ac4..b492764c99 100644 --- a/src/infrastructure/storage/management/workflow/PhabricatorStorageManagementQuickstartWorkflow.php +++ b/src/infrastructure/storage/management/workflow/PhabricatorStorageManagementQuickstartWorkflow.php @@ -10,7 +10,7 @@ final class PhabricatorStorageManagementQuickstartWorkflow ->setSynopsis( pht( 'Generate a new quickstart database dump. This command is mostly '. - 'useful when developing Phabricator.')) + 'useful for internal development.')) ->setArguments( array( array( diff --git a/src/infrastructure/storage/management/workflow/PhabricatorStorageManagementUpgradeWorkflow.php b/src/infrastructure/storage/management/workflow/PhabricatorStorageManagementUpgradeWorkflow.php index e0b8d884c5..6a268cd440 100644 --- a/src/infrastructure/storage/management/workflow/PhabricatorStorageManagementUpgradeWorkflow.php +++ b/src/infrastructure/storage/management/workflow/PhabricatorStorageManagementUpgradeWorkflow.php @@ -46,8 +46,8 @@ final class PhabricatorStorageManagementUpgradeWorkflow phutil_console_wrap( pht( 'Before running storage upgrades, you should take down the '. - 'Phabricator web interface and stop any running Phabricator '. - 'daemons (you can disable this warning with %s).', + 'web interface and stop any running daemons (you can disable '. + 'this warning with %s).', '--force'))); if (!phutil_console_confirm(pht('Are you ready to continue?'))) { diff --git a/src/infrastructure/storage/management/workflow/PhabricatorStorageManagementWorkflow.php b/src/infrastructure/storage/management/workflow/PhabricatorStorageManagementWorkflow.php index 71f6374b2a..38a7b7788c 100644 --- a/src/infrastructure/storage/management/workflow/PhabricatorStorageManagementWorkflow.php +++ b/src/infrastructure/storage/management/workflow/PhabricatorStorageManagementWorkflow.php @@ -47,7 +47,7 @@ abstract class PhabricatorStorageManagementWorkflow throw new PhutilArgumentUsageException( pht( - 'Phabricator is configured in cluster mode, with multiple database '. + 'This server is configured in cluster mode, with multiple database '. 'hosts. Use "--host" to specify which host you want to operate on.')); } @@ -98,7 +98,7 @@ abstract class PhabricatorStorageManagementWorkflow } else { throw new PhutilArgumentUsageException( pht( - 'Phabricator is currently in read-only mode. Use --force to '. + 'This server is currently in read-only mode. Use --force to '. 'override this mode.')); } } @@ -189,7 +189,7 @@ abstract class PhabricatorStorageManagementWorkflow "You can exit this workflow, update MySQL now, and then run this ". "workflow again. This is recommended, but may cause a lot of downtime ". "right now.\n\n". - "You can exit this workflow, continue using Phabricator without ". + "You can exit this workflow, continue using this software without ". "applying adjustments, update MySQL at a later date, and then run ". "this workflow again. This is also a good approach, and will let you ". "delay downtime until later.\n\n". @@ -826,8 +826,8 @@ abstract class PhabricatorStorageManagementWorkflow $message = array(); if ($all_surplus) { $message[] = pht( - 'You have surplus schemata (extra tables or columns which Phabricator '. - 'does not expect). For information on resolving these '. + 'You have surplus schemata (extra tables or columns which this '. + 'software does not expect). For information on resolving these '. 'issues, see the "Surplus Schemata" section in the "Managing Storage '. 'Adjustments" article in the documentation.'); } else if ($all_access) { @@ -844,27 +844,29 @@ abstract class PhabricatorStorageManagementWorkflow $message[] = pht( 'Some of these errors are caused by access control problems. '. 'The user you are connecting with does not have permission to see '. - 'all of the database or tables that Phabricator uses. You need to '. + 'all of the database or tables that this software uses. You need to '. 'GRANT the user more permission, or use a different user.'); } if ($any_surplus) { $message[] = pht( 'Some of these errors are caused by surplus schemata (extra '. - 'tables or columns which Phabricator does not expect). These are '. + 'tables or columns which this software does not expect). These are '. 'not serious. For information on resolving these issues, see the '. '"Surplus Schemata" section in the "Managing Storage Adjustments" '. 'article in the documentation.'); } $message[] = pht( - 'If you are not developing Phabricator itself, report this issue to '. - 'the upstream.'); + 'If you are not developing %s itself, report this issue to '. + 'the upstream.', + PlatformSymbols::getPlatformServerName()); $message[] = pht( - 'If you are developing Phabricator, these errors usually indicate '. + 'If you are developing %s, these errors usually indicate '. 'that your schema specifications do not agree with the schemata your '. - 'code actually builds.'); + 'code actually builds.', + PlatformSymbols::getPlatformServerName()); } $message = implode("\n\n", $message); diff --git a/src/infrastructure/util/password/PhabricatorPasswordHasher.php b/src/infrastructure/util/password/PhabricatorPasswordHasher.php index f0f30045c0..fe35d2c296 100644 --- a/src/infrastructure/util/password/PhabricatorPasswordHasher.php +++ b/src/infrastructure/util/password/PhabricatorPasswordHasher.php @@ -307,7 +307,7 @@ abstract class PhabricatorPasswordHasher extends Phobject { throw new PhabricatorPasswordHasherUnavailableException( pht( 'Attempting to compare a password saved with the "%s" hash. No such '. - 'hasher is known to Phabricator.', + 'hasher is known.', $name)); } diff --git a/src/view/page/PhabricatorStandardPageView.php b/src/view/page/PhabricatorStandardPageView.php index ecb12bb81d..6f6ce56cad 100644 --- a/src/view/page/PhabricatorStandardPageView.php +++ b/src/view/page/PhabricatorStandardPageView.php @@ -276,7 +276,7 @@ final class PhabricatorStandardPageView extends PhabricatorBarePageView 'doc_name' => pht('See Documentation'), 'doc_href' => $doc_href, 'message' => pht( - 'Phabricator thinks you are using %s, but your '. + 'This server thinks you are using %s, but your '. 'client is convinced that it is using %s. This is a serious '. 'misconfiguration with subtle, but significant, consequences.', $server_protocol, $client_protocol), -- 2.11.4.GIT