@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 3
Summary: Ref T13658.
Test Plan:
This is non-exhaustive.
- Ran all setup checks.
Maniphest Tasks: T13658
Differential Revision: https://secure.phabricator.com/D21767
+107
-101
+1
-1
src/aphront/configuration/AphrontApplicationConfiguration.php
+1
-1
src/aphront/configuration/AphrontApplicationConfiguration.php
···
83
83
* @phutil-external-symbol class PhabricatorStartup
84
84
*/
85
85
public static function runHTTPRequest(AphrontHTTPSink $sink) {
86
-
if (isset($_SERVER['HTTP_X_PHABRICATOR_SELFCHECK'])) {
86
+
if (isset($_SERVER['HTTP_X_SETUP_SELFCHECK'])) {
87
87
$response = self::newSelfCheckResponse();
88
88
return self::writeResponse($sink, $response);
89
89
}
+8
-9
src/applications/config/check/PhabricatorDaemonsSetupCheck.php
+8
-9
src/applications/config/check/PhabricatorDaemonsSetupCheck.php
···
26
26
$doc_href = PhabricatorEnv::getDoclink('Managing Daemons with phd');
27
27
28
28
$summary = pht(
29
-
'You must start the Phabricator daemons to send email, rebuild '.
30
-
'search indexes, and do other background processing.');
29
+
'You must start the daemons to send email, rebuild search indexes, '.
30
+
'and do other background processing.');
31
31
32
32
$message = pht(
33
-
'The Phabricator daemons are not running, so Phabricator will not '.
34
-
'be able to perform background processing (including sending email, '.
35
-
'rebuilding search indexes, importing commits, cleaning up old data, '.
36
-
'and running builds).'.
33
+
'The daemons are not running, background processing (including '.
34
+
'sending email, rebuilding search indexes, importing commits, '.
35
+
'cleaning up old data, and running builds) can not be performed.'.
37
36
"\n\n".
38
37
'Use %s to start daemons. See %s for more information.',
39
38
phutil_tag('tt', array(), 'bin/phd start'),
···
47
46
48
47
$this->newIssue('daemons.not-running')
49
48
->setShortName(pht('Daemons Not Running'))
50
-
->setName(pht('Phabricator Daemons Are Not Running'))
49
+
->setName(pht('Daemons Are Not Running'))
51
50
->setSummary($summary)
52
51
->setMessage($message)
53
-
->addCommand('phabricator/ $ ./bin/phd start');
52
+
->addCommand('$ ./bin/phd start');
54
53
}
55
54
56
55
$expect_user = PhabricatorEnv::getEnvConfig('phd.user');
···
91
90
->setSummary($summary)
92
91
->setMessage($message)
93
92
->addPhabricatorConfig('phd.user')
94
-
->addCommand('phabricator/ $ ./bin/phd restart');
93
+
->addCommand('$ ./bin/phd restart');
95
94
96
95
break;
97
96
}
+22
-24
src/applications/config/check/PhabricatorExtraConfigSetupCheck.php
+22
-24
src/applications/config/check/PhabricatorExtraConfigSetupCheck.php
···
38
38
} else {
39
39
$summary = pht('This option is not recognized. It may be misspelled.');
40
40
$message = pht(
41
-
"The configuration option '%s' is not recognized. It may be ".
42
-
"misspelled, or it might have existed in an older version of ".
43
-
"Phabricator. It has no effect, and should be corrected or deleted.",
41
+
'The configuration option "%s" is not recognized. It may be '.
42
+
'misspelled, or it might have existed in an older version of '.
43
+
'the software. It has no effect, and should be corrected or deleted.',
44
44
$key);
45
45
$short = pht('Unknown Config');
46
46
$name = pht('Unknown Configuration Option "%s"', $key);
···
76
76
$issue->setMessage($message);
77
77
78
78
if ($found_local) {
79
-
$command = csprintf('phabricator/ $ ./bin/config delete %s', $key);
79
+
$command = csprintf('$ ./bin/config delete %s', $key);
80
80
$issue->addCommand($command);
81
81
}
82
82
···
155
155
'details about this setup issue, see %s.'.
156
156
"\n\n".
157
157
'This database value is currently respected, but a future version '.
158
-
'of Phabricator will stop respecting database values for locked '.
158
+
'of the software will stop respecting database values for locked '.
159
159
'configuration options.',
160
160
$key,
161
161
$set_command,
···
167
167
),
168
168
$doc_name));
169
169
$command = csprintf(
170
-
'phabricator/ $ ./bin/config delete --database %R',
170
+
'$ ./bin/config delete --database %R',
171
171
$key);
172
172
173
173
$this->newIssue('config.locked.'.$key)
···
191
191
pht(
192
192
'The "feed.http-hooks" option is deprecated in favor of '.
193
193
'Webhooks. This option will be removed in a future version '.
194
-
'of Phabricator.'.
194
+
'of the software.'.
195
195
"\n\n".
196
196
'You can configure Webhooks in Herald.'.
197
197
"\n\n".
···
283
283
'Reply handlers can no longer be overridden with configuration.');
284
284
285
285
$monospace_reason = pht(
286
-
'Phabricator no longer supports global customization of monospaced '.
287
-
'fonts.');
286
+
'Global customization of monospaced fonts is no longer supported.');
288
287
289
288
$public_mail_reason = pht(
290
289
'Inbound mail addresses are now configured for each application '.
···
346
345
'auth.sshkeys.enabled' => pht(
347
346
'SSH keys are now actually useful, so they are always enabled.'),
348
347
'differential.anonymous-access' => pht(
349
-
'Phabricator now has meaningful global access controls. See `%s`.',
348
+
'Global access controls now exist, see `%s`.',
350
349
'policy.allow-public'),
351
350
'celerity.resource-path' => pht(
352
351
'An alternate resource map is no longer supported. Instead, use '.
···
356
355
'auth.sessions.conduit' => $session_reason,
357
356
'auth.sessions.web' => $session_reason,
358
357
'tokenizer.ondemand' => pht(
359
-
'Phabricator now manages typeahead strategies automatically.'),
358
+
'Typeahead strategies are now managed automatically.'),
360
359
'differential.revision-custom-detail-renderer' => pht(
361
360
'Obsolete; use standard rendering events instead.'),
362
361
'differential.show-host-field' => $differential_field_reason,
···
383
382
'pool size with `%s`.',
384
383
'phd.taskmasters'),
385
384
'storage.engine-selector' => pht(
386
-
'Phabricator now automatically discovers available storage engines '.
387
-
'at runtime.'),
385
+
'Storage engines are now discovered automatically at runtime.'),
388
386
'storage.upload-size-limit' => pht(
389
-
'Phabricator now supports arbitrarily large files. Consult the '.
387
+
'Arbitrarily large files are now supported. Consult the '.
390
388
'documentation for configuration details.'),
391
389
'security.allow-outbound-http' => pht(
392
390
'This option has been replaced with the more granular option `%s`.',
393
391
'security.outbound-blacklist'),
394
392
'metamta.reply.show-hints' => pht(
395
-
'Phabricator no longer shows reply hints in mail.'),
393
+
'Reply hints are no longer shown in mail.'),
396
394
397
395
'metamta.differential.reply-handler-domain' => $reply_domain_reason,
398
396
'metamta.diffusion.reply-handler-domain' => $reply_domain_reason,
···
406
404
'metamta.package.reply-handler' => $reply_handler_reason,
407
405
408
406
'metamta.precedence-bulk' => pht(
409
-
'Phabricator now always sends transaction mail with '.
410
-
'"Precedence: bulk" to improve deliverability.'),
407
+
'Transaction mail is now always sent with "Precedence: bulk" to '.
408
+
'improve deliverability.'),
411
409
412
410
'style.monospace' => $monospace_reason,
413
411
'style.monospace.windows' => $monospace_reason,
414
412
415
413
'search.engine-selector' => pht(
416
-
'Phabricator now automatically discovers available search engines '.
417
-
'at runtime.'),
414
+
'Available search engines are now automatically discovered at '.
415
+
'runtime.'),
418
416
419
417
'metamta.files.public-create-email' => $public_mail_reason,
420
418
'metamta.maniphest.public-create-email' => $public_mail_reason,
···
469
467
'maniphest.priorities.needs-triage' => $dashboard_reason,
470
468
471
469
'mysql.implementation' => pht(
472
-
'Phabricator now automatically selects the best available '.
473
-
'MySQL implementation.'),
470
+
'The best available MYSQL implementation is now selected '.
471
+
'automatically.'),
474
472
475
473
'mysql.configuration-provider' => pht(
476
-
'Phabricator now has application-level management of partitioning '.
477
-
'and replicas.'),
474
+
'Partitioning and replication are now managed in primary '.
475
+
'configuration.'),
478
476
479
477
'search.elastic.host' => $elastic_reason,
480
478
'search.elastic.namespace' => $elastic_reason,
···
541
539
'Whitespace rendering is now handled automatically.'),
542
540
543
541
'phd.pid-directory' => pht(
544
-
'Phabricator daemons no longer use PID files.'),
542
+
'Daemons no longer use PID files.'),
545
543
546
544
'phd.trace' => $phd_reason,
547
545
'phd.verbose' => $phd_reason,
+24
-18
src/applications/config/check/PhabricatorManualActivitySetupCheck.php
+24
-18
src/applications/config/check/PhabricatorManualActivitySetupCheck.php
···
42
42
'function correctly.');
43
43
44
44
$message[] = pht(
45
-
'You can rebuild the search index while Phabricator is running.');
45
+
'You can rebuild the search index while the server is running.');
46
46
47
47
$message[] = pht(
48
48
'To rebuild the index, run this command:');
···
51
51
'pre',
52
52
array(),
53
53
(string)csprintf(
54
-
'phabricator/ $ ./bin/search index --all --force --background'));
54
+
'$ ./bin/search index --all --force --background'));
55
55
56
56
$message[] = pht(
57
57
'You can find more information about rebuilding the search '.
···
71
71
$message[] = phutil_tag(
72
72
'pre',
73
73
array(),
74
-
'phabricator/ $ ./bin/config done reindex');
74
+
'$ ./bin/config done reindex');
75
75
76
76
$activity_message = phutil_implode_html("\n\n", $message);
77
77
···
84
84
private function raiseRebuildIdentitiesIssue() {
85
85
$activity_name = pht('Rebuild Repository Identities');
86
86
$activity_summary = pht(
87
-
'The mapping from VCS users to Phabricator users has changed '.
88
-
'and must be rebuilt.');
87
+
'The mapping from VCS users to %s users has changed '.
88
+
'and must be rebuilt.',
89
+
PlatformSymbols::getPlatformServerName());
89
90
90
91
$message = array();
91
92
92
93
$message[] = pht(
93
-
'The way Phabricator attributes VCS activity to Phabricator users '.
94
-
'has changed. There is a new indirection layer between the strings '.
95
-
'that appear as VCS authors and committers (such as "John Developer '.
96
-
'<johnd@bigcorp.com>") and the Phabricator user that gets associated '.
97
-
'with VCS commits. This is to support situations where users '.
98
-
'are incorrectly associated with commits by Phabricator making bad '.
99
-
'guesses about the identity of the corresponding Phabricator user. '.
94
+
'The way VCS activity is attributed %s user accounts has changed.',
95
+
PlatformSymbols::getPlatformServerName());
96
+
97
+
$message[] = pht(
98
+
'There is a new indirection layer between the strings that appear as '.
99
+
'VCS authors and committers (such as "John Developer '.
100
+
'<johnd@bigcorp.com>") and the user account that gets associated '.
101
+
'with VCS commits.');
102
+
103
+
$message[] = pht(
104
+
'This change supports situations where users are incorrectly '.
105
+
'associated with commits because the software makes a bad guess '.
106
+
'about how the VCS string maps to a user account. '.
100
107
'This also helps with situations where existing repositories are '.
101
108
'imported without having created accounts for all the committers to '.
102
109
'that repository. Until you rebuild these repository identities, you '.
103
-
'are likely to encounter problems with future Phabricator features '.
104
-
'which will rely on the existence of these identities.');
110
+
'are likely to encounter problems with features which rely on the '.
111
+
'existence of these identities.');
105
112
106
113
$message[] = pht(
107
-
'You can rebuild repository identities while Phabricator is running.');
114
+
'You can rebuild repository identities while the server is running.');
108
115
109
116
$message[] = pht(
110
117
'To rebuild identities, run this command:');
···
113
120
'pre',
114
121
array(),
115
122
(string)csprintf(
116
-
'phabricator/ $ '.
117
-
'./bin/repository rebuild-identities --all-repositories'));
123
+
'$ ./bin/repository rebuild-identities --all-repositories'));
118
124
119
125
$message[] = pht(
120
126
'You can find more information about this new identity mapping '.
···
134
140
$message[] = phutil_tag(
135
141
'pre',
136
142
array(),
137
-
'phabricator/ $ ./bin/config done identities');
143
+
'$ ./bin/config done identities');
138
144
139
145
$activity_message = phutil_implode_html("\n\n", $message);
140
146
+12
-9
src/applications/config/check/PhabricatorPHPPreflightSetupCheck.php
+12
-9
src/applications/config/check/PhabricatorPHPPreflightSetupCheck.php
···
15
15
if (version_compare($version, 7, '>=') &&
16
16
version_compare($version, 7.1, '<')) {
17
17
$message = pht(
18
-
'You are running PHP version %s. Phabricator does not support PHP '.
19
-
'versions between 7.0 and 7.1.'.
18
+
'You are running PHP version %s. PHP versions between 7.0 and 7.1 '.
19
+
'are not supported'.
20
20
"\n\n".
21
-
'PHP removed signal handling features that Phabricator requires in '.
22
-
'PHP 7.0, and did not restore them until PHP 7.1.'.
21
+
'PHP removed reqiured signal handling features in '.
22
+
'PHP 7.0, and did not restore an equivalent mechanism until PHP 7.1.'.
23
23
"\n\n".
24
24
'Upgrade to PHP 7.1 or newer (recommended) or downgrade to an older '.
25
25
'version of PHP 5 (discouraged).',
···
31
31
->setMessage($message)
32
32
->addLink(
33
33
'https://phurl.io/u/php7',
34
-
pht('Phabricator PHP 7 Compatibility Information'));
34
+
pht('PHP 7 Compatibility Information'));
35
35
36
36
return;
37
37
}
38
38
39
+
// TODO: This can be removed entirely because the minimum PHP version is
40
+
// now PHP 5.5, which does not have safe mode.
41
+
39
42
$safe_mode = ini_get('safe_mode');
40
43
if ($safe_mode) {
41
44
$message = pht(
42
-
"You have '%s' enabled in your PHP configuration, but Phabricator ".
45
+
"You have '%s' enabled in your PHP configuration, but this software ".
43
46
"will not run in safe mode. Safe mode has been deprecated in PHP 5.3 ".
44
47
"and removed in PHP 5.4.\n\nDisable safe mode to continue.",
45
48
'safe_mode');
···
89
92
if ($fatal) {
90
93
$message = pht(
91
94
"You have '%s' enabled in your PHP configuration.\n\n".
92
-
"This option is not compatible with Phabricator. Remove ".
95
+
"This option is not compatible with this software. Remove ".
93
96
"'%s' from your configuration to continue.",
94
97
$disable_option,
95
98
$disable_option);
···
108
111
if ($func_overload) {
109
112
$message = pht(
110
113
"You have '%s' enabled in your PHP configuration.\n\n".
111
-
"This option is not compatible with Phabricator. Disable ".
114
+
"This option is not compatible with this software. Disable ".
112
115
"'%s' in your PHP configuration to continue.",
113
116
$overload_option,
114
117
$overload_option);
···
131
134
// rare (particularly in supported environments).
132
135
133
136
$message = pht(
134
-
"Your server is configured with '%s', which prevents Phabricator ".
137
+
"Your server is configured with '%s', which prevents this software ".
135
138
"from opening files it requires access to.\n\n".
136
139
"Disable this setting to continue.",
137
140
'open_basedir');
+28
-28
src/applications/config/check/PhabricatorWebServerSetupCheck.php
+28
-28
src/applications/config/check/PhabricatorWebServerSetupCheck.php
···
16
16
->setSummary(pht('Pagespeed is enabled, but should be disabled.'))
17
17
->setMessage(
18
18
pht(
19
-
'Phabricator received an "X-Mod-Pagespeed" or "X-Page-Speed" '.
19
+
'This server received an "X-Mod-Pagespeed" or "X-Page-Speed" '.
20
20
'HTTP header on this request, which indicates that you have '.
21
21
'enabled "mod_pagespeed" on this server. This module is not '.
22
-
'compatible with Phabricator. You should disable it.'));
22
+
'compatible with this software. You should disable the module.'));
23
23
}
24
24
25
25
$base_uri = PhabricatorEnv::getEnvConfig('phabricator.base-uri');
···
43
43
->replaceQueryParam($expect_key, $expect_value);
44
44
45
45
$self_future = id(new HTTPSFuture($base_uri))
46
-
->addHeader('X-Phabricator-SelfCheck', 1)
46
+
->addHeader('X-Setup-SelfCheck', 1)
47
47
->addHeader('Accept-Encoding', 'gzip')
48
48
->setDisableContentDecoding(true)
49
49
->setHTTPBasicAuthCredentials(
···
56
56
$gzip_compressed = gzencode($gzip_uncompressed);
57
57
58
58
$gzip_future = id(new HTTPSFuture($base_uri))
59
-
->addHeader('X-Phabricator-SelfCheck', 1)
59
+
->addHeader('X-Setup-SelfCheck', 1)
60
60
->addHeader('Content-Encoding', 'gzip')
61
61
->setTimeout(5)
62
62
->setData($gzip_compressed);
···
91
91
$body = trim($body);
92
92
if (preg_match('/^t2/', $body)) {
93
93
$message = pht(
94
-
'Phabricator appears to be installed on a very small EC2 instance '.
94
+
'This software appears to be installed on a very small EC2 instance '.
95
95
'(of class "%s") with burstable CPU. This is strongly discouraged. '.
96
-
'Phabricator regularly needs CPU, and these instances are often '.
96
+
'This software regularly needs CPU, and these instances are often '.
97
97
'choked to death by CPU throttling. Use an instance with a normal '.
98
98
'CPU instead.',
99
99
$body);
···
102
102
->setName(pht('Installed on Burstable CPU Instance'))
103
103
->setSummary(
104
104
pht(
105
-
'Do not install Phabricator on an instance class with '.
105
+
'Do not install this software on an instance class with '.
106
106
'burstable CPU.'))
107
107
->setMessage($message);
108
108
}
···
121
121
122
122
if (BaseHTTPFuture::getHeader($headers, 'Content-Encoding') != 'gzip') {
123
123
$message = pht(
124
-
'Phabricator sent itself a request with "Accept-Encoding: gzip", '.
124
+
'This software sent itself a request with "Accept-Encoding: gzip", '.
125
125
'but received an uncompressed response.'.
126
126
"\n\n".
127
127
'This may indicate that your webserver is not configured to '.
···
163
163
->truncateString($body);
164
164
165
165
$message = pht(
166
-
'Phabricator sent itself a test request with the '.
167
-
'"X-Phabricator-SelfCheck" header and expected to get a valid JSON '.
166
+
'This software sent itself a test request with the '.
167
+
'"X-Setup-SelfCheck" header and expected to get a valid JSON '.
168
168
'response back. Instead, the response begins:'.
169
169
"\n\n".
170
170
'%s'.
···
173
173
phutil_tag('pre', array(), $short));
174
174
} else {
175
175
$message = pht(
176
-
'Phabricator sent itself a test request and expected to get a bare '.
177
-
'JSON response back. It received a JSON response, but the response '.
178
-
'had extra whitespace at the beginning or end.'.
176
+
'This software sent itself a test request and expected to get a '.
177
+
'bare JSON response back. It received a JSON response, but the '.
178
+
'response had extra whitespace at the beginning or end.'.
179
179
"\n\n".
180
180
'This usually means you have edited a file and left whitespace '.
181
181
'characters before the opening %s tag, or after a closing %s tag. '.
···
199
199
$actual_pass = idx($structure, 'pass');
200
200
if (($expect_user != $actual_user) || ($actual_pass != $expect_pass)) {
201
201
$message = pht(
202
-
'Phabricator sent itself a test request with an "Authorization" HTTP '.
203
-
'header, and expected those credentials to be transmitted. However, '.
204
-
'they were absent or incorrect when received. Phabricator sent '.
205
-
'username "%s" with password "%s"; received username "%s" and '.
206
-
'password "%s".'.
202
+
'This software sent itself a test request with an "Authorization" '.
203
+
'HTTP header, and expected those credentials to be transmitted. '.
204
+
'However, they were absent or incorrect when received. This '.
205
+
'software sent username "%s" with password "%s"; received '.
206
+
'username "%s" and password "%s".'.
207
207
"\n\n".
208
208
'Your webserver may not be configured to forward HTTP basic '.
209
209
'authentication. If you plan to use basic authentication (for '.
···
222
222
$actual_path = idx($structure, 'path');
223
223
if ($expect_path != $actual_path) {
224
224
$message = pht(
225
-
'Phabricator sent itself a test request with an unusual path, to '.
225
+
'This software sent itself a test request with an unusual path, to '.
226
226
'test if your webserver is rewriting paths correctly. The path was '.
227
227
'not transmitted correctly.'.
228
228
"\n\n".
229
-
'Phabricator sent a request to path "%s", and expected the webserver '.
230
-
'to decode and rewrite that path so that it received a request for '.
231
-
'"%s". However, it received a request for "%s" instead.'.
229
+
'This software sent a request to path "%s", and expected the '.
230
+
'webserver to decode and rewrite that path so that it received a '.
231
+
'request for "%s". However, it received a request for "%s" instead.'.
232
232
"\n\n".
233
233
'Verify that your rewrite rules are configured correctly, following '.
234
234
'the instructions in the documentation. If path encoding is not '.
···
258
258
259
259
if (($expect_key !== $actual_key) || ($expect_value !== $actual_value)) {
260
260
$message = pht(
261
-
'Phabricator sent itself a test request with an HTTP GET parameter, '.
261
+
'This software sent itself a test request with an HTTP GET parameter, '.
262
262
'but the parameter was not transmitted. Sent "%s" with value "%s", '.
263
263
'got "%s" with value "%s".'.
264
264
"\n\n".
265
265
'Your webserver is configured incorrectly and large parts of '.
266
-
'Phabricator will not work until this issue is corrected.'.
266
+
'this software will not work until this issue is corrected.'.
267
267
"\n\n".
268
268
'(This problem can be caused by a missing "QSA" in your RewriteRule.)',
269
269
$expect_key,
···
320
320
321
321
$message = array();
322
322
$message[] = pht(
323
-
'Phabricator sent itself a test request that was compressed with '.
323
+
'This software sent itself a test request that was compressed with '.
324
324
'"Content-Encoding: gzip", but received different bytes than it '.
325
325
'sent.');
326
326
···
342
342
'compressed requests.');
343
343
344
344
$message[] = pht(
345
-
'The request body Phabricator sent began:');
345
+
'The request body that was sent began:');
346
346
$message[] = $this->snipBytes($compressed);
347
347
348
348
$message[] = pht(
349
-
'The request body Phabricator received began:');
349
+
'The request body that was received began:');
350
350
$message[] = $this->snipBytes($raw_body);
351
351
}
352
352
353
353
$message[] = pht(
354
354
'Identify the component in your webserver configuration which is '.
355
-
'decompressing or mangling requests and disable it. Phabricator '.
355
+
'decompressing or mangling requests and disable it. This software '.
356
356
'will not work properly until you do.');
357
357
358
358
$message = phutil_implode_html("\n\n", $message);
+3
-3
src/applications/config/controller/PhabricatorConfigConsoleController.php
+3
-3
src/applications/config/controller/PhabricatorConfigConsoleController.php
···
56
56
->setBorder(true);
57
57
58
58
$box = id(new PHUIObjectBoxView())
59
-
->setHeaderText(pht('Phabricator Configuration'))
59
+
->setHeaderText(pht('Configuration'))
60
60
->setBackground(PHUIObjectBoxView::WHITE_CONFIG)
61
61
->setObjectList($menu);
62
62
···
72
72
->setFooter($launcher_view);
73
73
74
74
return $this->newPage()
75
-
->setTitle(pht('Phabricator Configuration'))
75
+
->setTitle(pht('Configuration'))
76
76
->setCrumbs($crumbs)
77
77
->appendChild($view);
78
78
}
···
131
131
));
132
132
133
133
return id(new PHUIObjectBoxView())
134
-
->setHeaderText(pht('Phabricator Version Information'))
134
+
->setHeaderText(pht('Version Information'))
135
135
->setBackground(PHUIObjectBoxView::BLUE_PROPERTY)
136
136
->appendChild($table_view);
137
137
}
+1
-1
src/applications/config/controller/services/PhabricatorConfigClusterDatabasesController.php
+1
-1
src/applications/config/controller/services/PhabricatorConfigClusterDatabasesController.php
+1
-1
src/applications/config/custom/PhabricatorCustomLogoConfigType.php
+1
-1
src/applications/config/custom/PhabricatorCustomLogoConfigType.php
···
108
108
$controls[] = id(new AphrontFormTextControl())
109
109
->setName('wordmarkText')
110
110
->setLabel(pht('Wordmark'))
111
-
->setPlaceholder(pht('Phabricator'))
111
+
->setPlaceholder(PlatformSymbols::getPlatformServerName())
112
112
->setValue($wordmark_text);
113
113
114
114
return $controls;
+1
-1
src/applications/config/editor/PhabricatorConfigEditor.php
+1
-1
src/applications/config/editor/PhabricatorConfigEditor.php
+6
-6
src/applications/config/option/PhabricatorClusterConfigOptions.php
+6
-6
src/applications/config/option/PhabricatorClusterConfigOptions.php
···
8
8
}
9
9
10
10
public function getDescription() {
11
-
return pht('Configure Phabricator to run on a cluster of hosts.');
11
+
return pht('Configure services to run on a cluster of hosts.');
12
12
}
13
13
14
14
public function getIcon() {
···
25
25
WARNING: This is a prototype option and the description below is currently pure
26
26
fantasy.
27
27
28
-
This option allows you to make Phabricator aware of database read replicas so
28
+
This option allows you to make this service aware of database read replicas so
29
29
it can monitor database health, spread load, and degrade gracefully to
30
30
read-only mode in the event of a failure on the primary host. For help with
31
31
configuring cluster databases, see **[[ %s | %s ]]** in the documentation.
···
55
55
->setSummary(pht('Address ranges of cluster hosts.'))
56
56
->setDescription(
57
57
pht(
58
-
'Define a Phabricator cluster by providing a whitelist of host '.
58
+
'Define a cluster by providing a whitelist of host '.
59
59
'addresses that are part of the cluster.'.
60
60
"\n\n".
61
61
'Hosts on this whitelist have special powers. These hosts are '.
···
67
67
'cluster and no additional hosts. See the examples below for '.
68
68
'details.'.
69
69
"\n\n".
70
-
'When cluster addresses are defined, Phabricator hosts will also '.
70
+
'When cluster addresses are defined, hosts will also '.
71
71
'reject requests to interfaces which are not whitelisted.',
72
72
$intro_href,
73
73
$intro_name))
···
101
101
'hosting providers running multi-tenant clusters.'.
102
102
"\n\n".
103
103
'If you provide an instance identifier here (normally by '.
104
-
'injecting it with a `%s`), Phabricator will pass it to '.
104
+
'injecting it with a `%s`), the server will pass it to '.
105
105
'subprocesses and commit hooks in the `%s` environmental variable.',
106
106
'PhabricatorConfigSiteSource',
107
107
'PHABRICATOR_INSTANCE')),
···
115
115
'WARNING: This is a prototype option and the description below '.
116
116
'is currently pure fantasy.'.
117
117
"\n\n".
118
-
'Switch Phabricator to read-only mode. In this mode, users will '.
118
+
'Switch the service to read-only mode. In this mode, users will '.
119
119
'be unable to write new data. Normally, the cluster degrades '.
120
120
'into this mode automatically when it detects that the database '.
121
121
'master is unreachable, but you can activate it manually in '.