Page MenuHomePhabricator

D21788.diff
No OneTemporary

D21788.diff

diff --git a/src/applications/people/controller/PhabricatorPeopleWelcomeController.php b/src/applications/people/controller/PhabricatorPeopleWelcomeController.php
--- a/src/applications/people/controller/PhabricatorPeopleWelcomeController.php
+++ b/src/applications/people/controller/PhabricatorPeopleWelcomeController.php
@@ -68,9 +68,10 @@
->appendRemarkupInstructions(
pht(
'This workflow will send this user ("%s") a copy of the "Welcome to '.
- 'Phabricator" email that users normally receive when their '.
+ '%s" email that users normally receive when their '.
'accounts are created by an administrator.',
- $user->getUsername()))
+ $user->getUsername(),
+ PlatformSymbols::getPlatformServerName()))
->appendRemarkupInstructions(
pht(
'The email will contain a link that the user may use to log in '.
diff --git a/src/applications/phame/storage/PhameBlog.php b/src/applications/phame/storage/PhameBlog.php
--- a/src/applications/phame/storage/PhameBlog.php
+++ b/src/applications/phame/storage/PhameBlog.php
@@ -154,7 +154,7 @@
$href = PhabricatorEnv::getProductionURI(
'/config/edit/policy.allow-public/');
return pht(
- 'For custom domains to work, this Phabricator instance must be '.
+ 'For custom domains to work, this this server must be '.
'configured to allow the public access policy. Configure this '.
'setting %s, or ask an administrator to configure this setting. '.
'The domain can be specified later once this setting has been '.
diff --git a/src/applications/policy/config/PhabricatorPolicyConfigOptions.php b/src/applications/policy/config/PhabricatorPolicyConfigOptions.php
--- a/src/applications/policy/config/PhabricatorPolicyConfigOptions.php
+++ b/src/applications/policy/config/PhabricatorPolicyConfigOptions.php
@@ -37,7 +37,7 @@
->setSummary(pht('Allow users to set object visibility to public.'))
->setDescription(
pht(
- "Phabricator allows you to set the visibility of objects (like ".
+ "This software allows you to set the visibility of objects (like ".
"repositories and tasks) to 'Public', which means **anyone ".
"on the internet can see them, without needing to log in or ".
"have an account**.".
@@ -59,7 +59,7 @@
->setSummary(pht(
'Lock specific application policies so they can not be edited.'))
->setDescription(pht(
- 'Phabricator has application policies which can dictate whether '.
+ 'This software has application policies which can dictate whether '.
'users can take certain actions, such as creating new users. '."\n\n".
'This setting allows for "locking" these policies such that no '.
'further edits can be made on a per-policy basis.'))
diff --git a/src/applications/policy/storage/PhabricatorPolicy.php b/src/applications/policy/storage/PhabricatorPolicy.php
--- a/src/applications/policy/storage/PhabricatorPolicy.php
+++ b/src/applications/policy/storage/PhabricatorPolicy.php
@@ -248,7 +248,7 @@
case PhabricatorPolicies::POLICY_PUBLIC:
return pht(
'This object is public and can be viewed by anyone, even if they '.
- 'do not have a Phabricator account.');
+ 'do not have an account on this server.');
case PhabricatorPolicies::POLICY_USER:
return pht('Logged in users can take this action.');
case PhabricatorPolicies::POLICY_ADMIN:
diff --git a/src/applications/repository/config/PhabricatorRepositoryConfigOptions.php b/src/applications/repository/config/PhabricatorRepositoryConfigOptions.php
--- a/src/applications/repository/config/PhabricatorRepositoryConfigOptions.php
+++ b/src/applications/repository/config/PhabricatorRepositoryConfigOptions.php
@@ -28,9 +28,10 @@
->setDescription(
pht(
'The default location in which to store working copies and other '.
- 'data about repositories. Phabricator will control and manage '.
+ 'data about repositories. %s will control and manage '.
'data here, so you should **not** choose an existing directory '.
- 'full of data you care about.')),
+ 'full of data you care about.',
+ PlatformSymbols::getPlatformServerName())),
);
}
diff --git a/src/applications/repository/storage/PhabricatorRepository.php b/src/applications/repository/storage/PhabricatorRepository.php
--- a/src/applications/repository/storage/PhabricatorRepository.php
+++ b/src/applications/repository/storage/PhabricatorRepository.php
@@ -1947,7 +1947,7 @@
'point at this host, or the "device.id" configuration file on '.
'this host may be incorrect.'.
"\n\n".
- 'Requests routed within the cluster by Phabricator are always '.
+ 'Requests routed within the cluster are always '.
'expected to be sent to a node which can serve the request. To '.
'prevent loops, this request will not be proxied again.'.
"\n\n".
@@ -2209,7 +2209,7 @@
throw new PhutilAggregateException(
pht(
'Unable to read device public key while attempting to make '.
- 'authenticated method call within the Phabricator cluster. '.
+ 'authenticated method call within the cluster. '.
'Use `%s` to register keys for this device. Exception: %s',
'bin/almanac register',
$ex->getMessage()),
@@ -2224,7 +2224,7 @@
throw new PhutilAggregateException(
pht(
'Unable to read device private key while attempting to make '.
- 'authenticated method call within the Phabricator cluster. '.
+ 'authenticated method call within the cluster. '.
'Use `%s` to register keys for this device. Exception: %s',
'bin/almanac register',
$ex->getMessage()),

File Metadata

Mime Type
text/plain
Expires
May 27 2024, 11:32 PM (7 w, 20 h ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
6285218
Default Alt Text
D21788.diff (5 KB)

Event Timeline