@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 14
Summary: Ref T13658.
Test Plan: Static checks only, these are mostly obscure or require breaking the install in unusual ways.
Maniphest Tasks: T13658
Differential Revision: https://secure.phabricator.com/D21780
+39
-40
+6
-6
src/applications/conduit/controller/PhabricatorConduitAPIController.php
+6
-6
src/applications/conduit/controller/PhabricatorConduitAPIController.php
···
261
261
return array(
262
262
'ERR-INVALID-AUTH',
263
263
pht(
264
-
'This request originates from outside of the Phabricator '.
265
-
'cluster address range. Requests signed with trusted '.
266
-
'device keys must originate from within the cluster.'),
264
+
'This request originates from outside of the cluster address '.
265
+
'range. Requests signed with trusted device keys must '.
266
+
'originate from within the cluster.'),
267
267
);
268
268
}
269
269
···
364
364
return array(
365
365
'ERR-INVALID-AUTH',
366
366
pht(
367
-
'This request originates from outside of the Phabricator '.
368
-
'cluster address range. Requests signed with cluster API '.
369
-
'tokens must originate from within the cluster.'),
367
+
'This request originates from outside of the cluster address '.
368
+
'range. Requests signed with cluster API tokens must '.
369
+
'originate from within the cluster.'),
370
370
);
371
371
}
372
372
+3
-3
src/applications/conduit/controller/PhabricatorConduitTokenEditController.php
+3
-3
src/applications/conduit/controller/PhabricatorConduitTokenEditController.php
···
87
87
if ($token->getTokenType() === PhabricatorConduitToken::TYPE_CLUSTER) {
88
88
$dialog->appendChild(
89
89
pht(
90
-
'This token is automatically generated by Phabricator, and used '.
91
-
'to make requests between nodes in a Phabricator cluster. You '.
92
-
'can not use this token in external applications.'));
90
+
'This token is automatically generated, and used to make '.
91
+
'requests between nodes in a cluster. You can not use this '.
92
+
'token in external applications.'));
93
93
} else {
94
94
$form->appendChild(
95
95
id(new AphrontFormTextControl())
+1
-1
src/applications/conduit/method/ConduitConnectConduitAPIMethod.php
+1
-1
src/applications/conduit/method/ConduitConnectConduitAPIMethod.php
+1
-1
src/applications/conduit/query/PhabricatorConduitSearchEngine.php
+1
-1
src/applications/conduit/query/PhabricatorConduitSearchEngine.php
+6
-6
src/applications/config/check/PhabricatorBaseURISetupCheck.php
+6
-6
src/applications/config/check/PhabricatorBaseURISetupCheck.php
···
17
17
$message = pht(
18
18
'This request did not include a "Host" header. This may mean that '.
19
19
'your webserver (like nginx or apache) is misconfigured so the '.
20
-
'"Host" header is not making it to Phabricator, or that you are '.
20
+
'"Host" header is not making it to this software, or that you are '.
21
21
'making a raw request without a "Host" header using a tool or '.
22
22
'library.'.
23
23
"\n\n".
···
38
38
'is required for some browsers to be able to set cookies.'.
39
39
"\n\n".
40
40
'This may mean the base URI is configured incorrectly. You must '.
41
-
'serve Phabricator from a base URI with a dot (like '.
42
-
'"https://phabricator.mycompany.com"), not a bare domain '.
43
-
'(like "https://phabricator/"). If you are trying to use a bare '.
41
+
'serve this software from a base URI with a dot (like '.
42
+
'"https://devtools.example.com"), not a bare domain '.
43
+
'(like "https://devtools/"). If you are trying to use a bare '.
44
44
'domain, change your configuration to use a full domain with a dot '.
45
45
'in it instead.'.
46
46
"\n\n".
···
76
76
'will not work properly until you configure it.'.
77
77
"\n\n".
78
78
'You should set the base URI to the URI you will use to access '.
79
-
'Phabricator, like "http://phabricator.example.com/".'.
79
+
'this server, like "http://devtools.example.com/".'.
80
80
"\n\n".
81
81
'Include the protocol (http or https), domain name, and port number if '.
82
82
'you are using a port other than 80 (http) or 443 (https).'.
···
96
96
->setMessage($message)
97
97
->addCommand(
98
98
hsprintf(
99
-
'<tt>phabricator/ $</tt> %s',
99
+
'<tt>$</tt> %s',
100
100
csprintf(
101
101
'./bin/config set phabricator.base-uri %s',
102
102
$base_uri_guess)));
+11
-12
src/applications/config/check/PhabricatorBinariesSetupCheck.php
+11
-12
src/applications/config/check/PhabricatorBinariesSetupCheck.php
···
15
15
16
16
if (!Filesystem::binaryExists($bin_name)) {
17
17
$message = pht(
18
-
"Without '%s', Phabricator can not test for the availability ".
18
+
"Without '%s', this software can not test for the availability ".
19
19
"of other binaries.",
20
20
$bin_name);
21
21
$this->raiseWarning($bin_name, $message);
···
27
27
28
28
if (!Filesystem::binaryExists('diff')) {
29
29
$message = pht(
30
-
"Without '%s', Phabricator will not be able to generate or render ".
30
+
"Without '%s', this software will not be able to generate or render ".
31
31
"diffs in multiple applications.",
32
32
'diff');
33
33
$this->raiseWarning('diff', $message);
···
162
162
$preamble = pht(
163
163
"The '%s' binary could not be found. Set the webserver's %s ".
164
164
"environmental variable to include the directory where it resides, or ".
165
-
"add that directory to '%s' in the Phabricator configuration.",
165
+
"add that directory to '%s' in configuration.",
166
166
$bin,
167
167
'PATH',
168
168
'environment.append-paths');
···
170
170
$preamble = pht(
171
171
"The '%s' binary could not be found. Symlink it into '%s', or set the ".
172
172
"webserver's %s environmental variable to include the directory where ".
173
-
"it resides, or add that directory to '%s' in the Phabricator ".
174
-
"configuration.",
173
+
"it resides, or add that directory to '%s' in configuration.",
175
174
$bin,
176
-
'phabricator/support/bin/',
175
+
'support/bin/',
177
176
'PATH',
178
177
'environment.append-paths');
179
178
}
···
194
193
195
194
$message = pht(
196
195
'Unable to determine the version number of "%s". Usually, this means '.
197
-
'the program changed its version format string recently and Phabricator '.
198
-
'does not know how to parse the new one yet, but might indicate that '.
199
-
'you have a very old (or broken) binary.'.
196
+
'the program changed its version format string recently and this '.
197
+
'software does not know how to parse the new one yet, but might '.
198
+
'indicate that you have a very old (or broken) binary.'.
200
199
"\n\n".
201
200
'Because we can not determine the version number, checks against '.
202
201
'minimum and known-bad versions will be skipped, so we might fail '.
203
202
'to detect an incompatible binary.'.
204
203
"\n\n".
205
-
'You may be able to resolve this issue by updating Phabricator, since '.
206
-
'a newer version of Phabricator is likely to be able to parse the '.
204
+
'You may be able to resolve this issue by updating this server, since '.
205
+
'a newer version of the software is likely to be able to parse the '.
207
206
'newer version string.'.
208
207
"\n\n".
209
-
'If updating Phabricator does not fix this, you can report the issue '.
208
+
'If updating the software does not fix this, you can report the issue '.
210
209
'to the upstream so we can adjust the parser.'.
211
210
"\n\n".
212
211
'If you are confident you have a recent version of "%s" installed and '.
+5
-5
src/applications/config/check/PhabricatorDatabaseSetupCheck.php
+5
-5
src/applications/config/check/PhabricatorDatabaseSetupCheck.php
···
35
35
->addPhabricatorConfig('mysql.port')
36
36
->addCommand(
37
37
hsprintf(
38
-
'<tt>phabricator/ $</tt> ./bin/config set mysql.host %s',
38
+
'<tt>$</tt> ./bin/config set mysql.host %s',
39
39
$host))
40
40
->addCommand(
41
41
hsprintf(
42
-
'<tt>phabricator/ $</tt> ./bin/config set mysql.port %s',
42
+
'<tt>$</tt> ./bin/config set mysql.port %s',
43
43
$port));
44
44
}
45
45
···
134
134
->setName(pht('Setup MySQL Schema'))
135
135
->setMessage($message)
136
136
->setIsFatal(true)
137
-
->addCommand(hsprintf('<tt>phabricator/ $</tt> ./bin/storage upgrade'));
137
+
->addCommand(hsprintf('<tt>$</tt> ./bin/storage upgrade'));
138
138
139
139
return true;
140
140
}
···
160
160
->setIsFatal(true)
161
161
->setMessage($message)
162
162
->addCommand(
163
-
hsprintf('<tt>phabricator/ $</tt> ./bin/storage upgrade'));
163
+
hsprintf('<tt>$</tt> ./bin/storage upgrade'));
164
164
165
165
return true;
166
166
}
···
177
177
'Database host "%s" is configured as a master, but is replicating '.
178
178
'another host. This is dangerous and can mangle or destroy data. '.
179
179
'Only replicas should be replicating. Stop replication on the '.
180
-
'host or reconfigure Phabricator.',
180
+
'host or adjust configuration.',
181
181
$ref->getRefKey());
182
182
183
183
$this->newIssue('db.master.replicating')
+3
-3
src/applications/config/check/PhabricatorElasticsearchSetupCheck.php
+3
-3
src/applications/config/check/PhabricatorElasticsearchSetupCheck.php
···
34
34
} catch (Exception $ex) {
35
35
$summary = pht('Elasticsearch is not reachable as configured.');
36
36
$message = pht(
37
-
'Elasticsearch is configured (with the %s setting) but Phabricator'.
38
-
' encountered an exception when trying to test the index.'.
37
+
'Elasticsearch is configured (with the %s setting) but an '.
38
+
'exception was encountered when trying to test the index.'.
39
39
"\n\n".
40
40
'%s',
41
41
phutil_tag('tt', array(), 'cluster.search'),
···
69
69
'Elasticsearch index exists but needs correction.');
70
70
71
71
$message = pht(
72
-
'Either the Phabricator schema for Elasticsearch has changed '.
72
+
'Either the schema for Elasticsearch has changed '.
73
73
'or Elasticsearch created the index automatically. '.
74
74
'Use the following command to rebuild the index.');
75
75
+1
-1
src/applications/config/check/PhabricatorFileinfoSetupCheck.php
+1
-1
src/applications/config/check/PhabricatorFileinfoSetupCheck.php
···
10
10
if (!extension_loaded('fileinfo')) {
11
11
$message = pht(
12
12
"The '%s' extension is not installed. Without '%s', ".
13
-
"support, Phabricator may not be able to determine the MIME types ".
13
+
"support, this software may not be able to determine the MIME types ".
14
14
"of uploaded files.",
15
15
'fileinfo',
16
16
'fileinfo');
+2
-2
src/applications/config/check/PhabricatorGDSetupCheck.php
+2
-2
src/applications/config/check/PhabricatorGDSetupCheck.php
···
10
10
if (!extension_loaded('gd')) {
11
11
$message = pht(
12
12
"The '%s' extension is not installed. Without '%s', support, ".
13
-
"Phabricator will not be able to process or resize images ".
13
+
"this server will not be able to process or resize images ".
14
14
"(for example, to generate thumbnails). Install or enable '%s'.",
15
15
'gd',
16
16
'gd',
···
41
41
42
42
$message = pht(
43
43
"The '%s' extension has support for only some image types. ".
44
-
"Phabricator will be unable to process images of the missing ".
44
+
"This server will be unable to process images of the missing ".
45
45
"types until you build '%s' with support for them. ".
46
46
"Supported types: %s. Missing types: %s.",
47
47
'gd',