Skip to content

Commit 039cbec

Browse files
author
epriestley
committed
Remove product literal strings in "pht()", part 11
Summary: Ref T13658. Test Plan: Static checks only, none of these looked easily reachable. Subscribers: PHID-OPKG-gm6ozazyms6q6i22gyam Maniphest Tasks: T13658 Differential Revision: https://secure.phabricator.com/D21777
1 parent adcc063 commit 039cbec

12 files changed

+45
-40
lines changed

resources/sql/patches/20130611.migrateoauth.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
foreach (new LiskRawMigrationIterator($conn, $table_name) as $row) {
88
throw new Exception(
99
pht(
10-
'Your Phabricator install has ancient OAuth account data and is '.
11-
'too old to upgrade directly to a modern version of Phabricator. '.
12-
'Upgrade to a version released between June 2013 and February 2019 '.
13-
'first, then upgrade to a modern version.'));
10+
'This database has ancient OAuth account data and is too old to '.
11+
'upgrade directly to a modern software version. Upgrade to a version '.
12+
'released between June 2013 and February 2019 first, then upgrade to '.
13+
'a modern version.'));
1414
}

resources/sql/patches/20130611.nukeldap.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
foreach (new LiskRawMigrationIterator($conn, $table_name) as $row) {
88
throw new Exception(
99
pht(
10-
'Your Phabricator install has ancient LDAP account data and is '.
11-
'too old to upgrade directly to a modern version of Phabricator. '.
12-
'Upgrade to a version released between June 2013 and February 2019 '.
13-
'first, then upgrade to a modern version.'));
10+
'This database has ancient LDAP account data and is too old to upgrade '.
11+
'directly to a modern version of the software. Upgrade to a version '.
12+
'released between June 2013 and February 2019 first, then upgrade to a '.
13+
'modern version.'));
1414
}

scripts/repository/commit_hook.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -122,9 +122,9 @@
122122
if (!strlen($username)) {
123123
throw new Exception(
124124
pht(
125-
'No Direct Pushes: You are pushing directly to a repository hosted '.
126-
'by Phabricator. This will not work. See "No Direct Pushes" in the '.
127-
'documentation for more information.'));
125+
'No Direct Pushes: You are pushing directly to a hosted repository. '.
126+
'This will not work. See "No Direct Pushes" in the documentation '.
127+
'for more information.'));
128128
}
129129

130130
if ($repository->isHg()) {

src/aphront/AphrontRequest.php

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -354,9 +354,9 @@ public function validateCSRF() {
354354
$info = array();
355355

356356
$info[] = pht(
357-
'You are trying to save some data to Phabricator, but the request '.
358-
'your browser made included an incorrect token. Reload the page '.
359-
'and try again. You may need to clear your cookies.');
357+
'You are trying to save some data to permanent storage, but the '.
358+
'request your browser made included an incorrect token. Reload the '.
359+
'page and try again. You may need to clear your cookies.');
360360

361361
if ($this->isAjax()) {
362362
$info[] = pht('This was an Ajax request.');
@@ -587,11 +587,11 @@ private function setCookieWithExpiration(
587587
throw new AphrontMalformedRequestException(
588588
pht('Bad Host Header'),
589589
pht(
590-
'This Phabricator install is configured as "%s", but you are '.
591-
'using the domain name "%s" to access a page which is trying to '.
592-
'set a cookie. Access Phabricator on the configured primary '.
593-
'domain or a configured alternate domain. Phabricator will not '.
594-
'set cookies on other domains for security reasons.',
590+
'This server is configured as "%s", but you are using the domain '.
591+
'name "%s" to access a page which is trying to set a cookie. '.
592+
'Access this service on the configured primary domain or a '.
593+
'configured alternate domain. Cookies will not be set on other '.
594+
'domains for security reasons.',
595595
$configured_as,
596596
$accessed_as),
597597
true);

src/aphront/configuration/AphrontApplicationConfiguration.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -419,9 +419,9 @@ private function buildController() {
419419
throw new AphrontMalformedRequestException(
420420
pht('No %s', 'SERVER_ADDR'),
421421
pht(
422-
'Phabricator is configured to operate in cluster mode, but '.
422+
'This service is configured to operate in cluster mode, but '.
423423
'%s is not defined in the request context. Your webserver '.
424-
'configuration needs to forward %s to PHP so Phabricator can '.
424+
'configuration needs to forward %s to PHP so the software can '.
425425
'reject requests received on external interfaces.',
426426
'SERVER_ADDR',
427427
'SERVER_ADDR'));
@@ -431,7 +431,7 @@ private function buildController() {
431431
throw new AphrontMalformedRequestException(
432432
pht('External Interface'),
433433
pht(
434-
'Phabricator is configured in cluster mode and the address '.
434+
'This service is configured in cluster mode and the address '.
435435
'this request was received on ("%s") is not whitelisted as '.
436436
'a cluster address.',
437437
$server_addr));

src/applications/almanac/management/AlmanacManagementRegisterWorkflow.php

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -147,10 +147,9 @@ public function execute(PhutilArgumentParser $args) {
147147
if (!$public_key) {
148148
throw new PhutilArgumentUsageException(
149149
pht(
150-
'The public key corresponding to the given private key is not '.
151-
'yet known to Phabricator. Associate the public key with an '.
152-
'Almanac device in the web interface before registering hosts '.
153-
'with it.'));
150+
'The public key corresponding to the given private key is unknown. '.
151+
'Associate the public key with an Almanac device in the web '.
152+
'interface before registering hosts with it.'));
154153
}
155154

156155
if ($public_key->getObjectPHID() !== $device->getPHID()) {

src/applications/almanac/management/AlmanacManagementTrustKeyWorkflow.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -61,14 +61,14 @@ public function execute(PhutilArgumentParser $args) {
6161
phutil_console_wrap(
6262
pht(
6363
'Trusting a public key gives anyone holding the corresponding '.
64-
'private key complete, unrestricted access to all data in '.
65-
'Phabricator. The private key will be able to sign requests that '.
66-
'skip policy and security checks.')),
64+
'private key complete, unrestricted access to all data. The '.
65+
'private key will be able to sign requests that bypass policy and '.
66+
'security checks.')),
6767
phutil_console_wrap(
6868
pht(
6969
'This is an advanced feature which should normally be used only '.
70-
'when building a Phabricator cluster. This feature is very '.
71-
'dangerous if misused.')),
70+
'when building a cluster. This feature is very dangerous if '.
71+
'misused.')),
7272
pht('This key is associated with device "%s".', $handle->getName()));
7373

7474
$prompt = pht(

src/applications/auth/controller/PhabricatorAuthConfirmLinkController.php

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,9 @@ public function handleRequest(AphrontRequest $request) {
5454
),
5555
pht(
5656
'Confirm the link with this %s account. This account will be '.
57-
'able to log in to your Phabricator account.',
58-
$provider->getProviderName())))
57+
'able to log in to your %s account.',
58+
$provider->getProviderName(),
59+
PlatformSymbols::getPlatformServerName())))
5960
->appendChild(
6061
id(new PhabricatorAuthAccountView())
6162
->setUser($viewer)

src/applications/auth/controller/PhabricatorAuthLinkController.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,8 @@ public function handleRequest(AphrontRequest $request) {
5656
pht('Account Already Linked'),
5757
array(
5858
pht(
59-
'Your Phabricator account is already linked to an external '.
60-
'account for this provider.'),
59+
'Your account is already linked to an external account for '.
60+
'this provider.'),
6161
));
6262
}
6363
break;

src/applications/config/option/PhabricatorCoreConfigOptions.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,7 @@ public function getOptions() {
8686
->setDescription(
8787
pht(
8888
'If you have multiple %s environments (like a '.
89-
'development/staging environment for working on testing '.
90-
'Phabricator, and a production environment for deploying it), '.
89+
'development/staging environment and a production environment), '.
9190
'set the production environment URI here so that emails and other '.
9291
'durable URIs will always generate with links pointing at the '.
9392
'production environment. If unset, defaults to `%s`. Most '.

0 commit comments

Comments
 (0)