@recaptime-dev's working patches + fork for Phorge, a community fork of Phabricator. (Upstream dev and stable branches are at upstream/main and upstream/stable respectively.)
hq.recaptime.dev/wiki/Phorge
phorge
phabricator
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
+45
-40
+4
-4
resources/sql/patches/20130611.migrateoauth.php
+4
-4
resources/sql/patches/20130611.migrateoauth.php
···
7
7
foreach (new LiskRawMigrationIterator($conn, $table_name) as $row) {
8
8
throw new Exception(
9
9
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.'));
14
14
}
+4
-4
resources/sql/patches/20130611.nukeldap.php
+4
-4
resources/sql/patches/20130611.nukeldap.php
···
7
7
foreach (new LiskRawMigrationIterator($conn, $table_name) as $row) {
8
8
throw new Exception(
9
9
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.'));
14
14
}
+3
-3
scripts/repository/commit_hook.php
+3
-3
scripts/repository/commit_hook.php
···
122
122
if (!strlen($username)) {
123
123
throw new Exception(
124
124
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.'));
128
128
}
129
129
130
130
if ($repository->isHg()) {
+8
-8
src/aphront/AphrontRequest.php
+8
-8
src/aphront/AphrontRequest.php
···
354
354
$info = array();
355
355
356
356
$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.');
360
360
361
361
if ($this->isAjax()) {
362
362
$info[] = pht('This was an Ajax request.');
···
587
587
throw new AphrontMalformedRequestException(
588
588
pht('Bad Host Header'),
589
589
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.',
595
595
$configured_as,
596
596
$accessed_as),
597
597
true);
+3
-3
src/aphront/configuration/AphrontApplicationConfiguration.php
+3
-3
src/aphront/configuration/AphrontApplicationConfiguration.php
···
419
419
throw new AphrontMalformedRequestException(
420
420
pht('No %s', 'SERVER_ADDR'),
421
421
pht(
422
-
'Phabricator is configured to operate in cluster mode, but '.
422
+
'This service is configured to operate in cluster mode, but '.
423
423
'%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 '.
425
425
'reject requests received on external interfaces.',
426
426
'SERVER_ADDR',
427
427
'SERVER_ADDR'));
···
431
431
throw new AphrontMalformedRequestException(
432
432
pht('External Interface'),
433
433
pht(
434
-
'Phabricator is configured in cluster mode and the address '.
434
+
'This service is configured in cluster mode and the address '.
435
435
'this request was received on ("%s") is not whitelisted as '.
436
436
'a cluster address.',
437
437
$server_addr));
+3
-4
src/applications/almanac/management/AlmanacManagementRegisterWorkflow.php
+3
-4
src/applications/almanac/management/AlmanacManagementRegisterWorkflow.php
···
147
147
if (!$public_key) {
148
148
throw new PhutilArgumentUsageException(
149
149
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.'));
154
153
}
155
154
156
155
if ($public_key->getObjectPHID() !== $device->getPHID()) {
+5
-5
src/applications/almanac/management/AlmanacManagementTrustKeyWorkflow.php
+5
-5
src/applications/almanac/management/AlmanacManagementTrustKeyWorkflow.php
···
61
61
phutil_console_wrap(
62
62
pht(
63
63
'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.')),
67
67
phutil_console_wrap(
68
68
pht(
69
69
'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.')),
72
72
pht('This key is associated with device "%s".', $handle->getName()));
73
73
74
74
$prompt = pht(
+3
-2
src/applications/auth/controller/PhabricatorAuthConfirmLinkController.php
+3
-2
src/applications/auth/controller/PhabricatorAuthConfirmLinkController.php
···
54
54
),
55
55
pht(
56
56
'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())))
59
60
->appendChild(
60
61
id(new PhabricatorAuthAccountView())
61
62
->setUser($viewer)
+2
-2
src/applications/auth/controller/PhabricatorAuthLinkController.php
+2
-2
src/applications/auth/controller/PhabricatorAuthLinkController.php
+1
-2
src/applications/config/option/PhabricatorCoreConfigOptions.php
+1
-2
src/applications/config/option/PhabricatorCoreConfigOptions.php
···
86
86
->setDescription(
87
87
pht(
88
88
'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), '.
91
90
'set the production environment URI here so that emails and other '.
92
91
'durable URIs will always generate with links pointing at the '.
93
92
'production environment. If unset, defaults to `%s`. Most '.
+3
-1
src/applications/metamta/controller/PhabricatorMetaMTAMailViewController.php
+3
-1
src/applications/metamta/controller/PhabricatorMetaMTAMailViewController.php
···
119
119
if ($mail->getFrom()) {
120
120
$from_str = $viewer->renderHandle($mail->getFrom());
121
121
} else {
122
-
$from_str = pht('Sent by Phabricator');
122
+
$from_str = pht(
123
+
'Sent by %s',
124
+
PlatformSymbols::getPlatformServerName());
123
125
}
124
126
$properties->addProperty(
125
127
pht('From'),
+6
-2
src/applications/people/mail/PhabricatorPeopleWelcomeMailEngine.php
+6
-2
src/applications/people/mail/PhabricatorPeopleWelcomeMailEngine.php
···
60
60
61
61
$message = array();
62
62
63
-
$message[] = pht('Welcome to Phabricator!');
63
+
$message[] = pht(
64
+
'Welcome to %s!',
65
+
PlatformSymbols::getPlatformServerName());
64
66
65
67
$message[] = pht(
66
68
'%s (%s) has created an account for you.',
···
129
131
130
132
$is_serious = PhabricatorEnv::getEnvConfig('phabricator.serious-business');
131
133
if (!$is_serious) {
132
-
return pht("Love,\nPhabricator");
134
+
return pht(
135
+
"Love,\n%s",
136
+
PlatformSymbols::getPlatformServerName());
133
137
}
134
138
135
139
return null;