Page MenuHomePhabricator
Files F13183408

D21777.diff
No OneTemporary
Actions

D21777.diff
View Options

diff --git a/resources/sql/patches/20130611.migrateoauth.php b/resources/sql/patches/20130611.migrateoauth.php
--- a/resources/sql/patches/20130611.migrateoauth.php
+++ b/resources/sql/patches/20130611.migrateoauth.php
@@ -7,8 +7,8 @@
foreach (new LiskRawMigrationIterator($conn, $table_name) as $row) {
throw new Exception(
pht(
- 'Your Phabricator install has ancient OAuth account data and is '.
- 'too old to upgrade directly to a modern version of Phabricator. '.
- 'Upgrade to a version released between June 2013 and February 2019 '.
- 'first, then upgrade to a modern version.'));
+ 'This database has ancient OAuth account data and is too old to '.
+ 'upgrade directly to a modern software version. Upgrade to a version '.
+ 'released between June 2013 and February 2019 first, then upgrade to '.
+ 'a modern version.'));
}
diff --git a/resources/sql/patches/20130611.nukeldap.php b/resources/sql/patches/20130611.nukeldap.php
--- a/resources/sql/patches/20130611.nukeldap.php
+++ b/resources/sql/patches/20130611.nukeldap.php
@@ -7,8 +7,8 @@
foreach (new LiskRawMigrationIterator($conn, $table_name) as $row) {
throw new Exception(
pht(
- 'Your Phabricator install has ancient LDAP account data and is '.
- 'too old to upgrade directly to a modern version of Phabricator. '.
- 'Upgrade to a version released between June 2013 and February 2019 '.
- 'first, then upgrade to a modern version.'));
+ 'This database has ancient LDAP account data and is too old to upgrade '.
+ 'directly to a modern version of the software. Upgrade to a version '.
+ 'released between June 2013 and February 2019 first, then upgrade to a '.
+ 'modern version.'));
}
diff --git a/scripts/repository/commit_hook.php b/scripts/repository/commit_hook.php
--- a/scripts/repository/commit_hook.php
+++ b/scripts/repository/commit_hook.php
@@ -122,9 +122,9 @@
if (!strlen($username)) {
throw new Exception(
pht(
- 'No Direct Pushes: You are pushing directly to a repository hosted '.
- 'by Phabricator. This will not work. See "No Direct Pushes" in the '.
- 'documentation for more information.'));
+ 'No Direct Pushes: You are pushing directly to a hosted repository. '.
+ 'This will not work. See "No Direct Pushes" in the documentation '.
+ 'for more information.'));
}
if ($repository->isHg()) {
diff --git a/src/aphront/AphrontRequest.php b/src/aphront/AphrontRequest.php
--- a/src/aphront/AphrontRequest.php
+++ b/src/aphront/AphrontRequest.php
@@ -354,9 +354,9 @@
$info = array();
$info[] = pht(
- 'You are trying to save some data to Phabricator, but the request '.
- 'your browser made included an incorrect token. Reload the page '.
- 'and try again. You may need to clear your cookies.');
+ 'You are trying to save some data to permanent storage, but the '.
+ 'request your browser made included an incorrect token. Reload the '.
+ 'page and try again. You may need to clear your cookies.');
if ($this->isAjax()) {
$info[] = pht('This was an Ajax request.');
@@ -587,11 +587,11 @@
throw new AphrontMalformedRequestException(
pht('Bad Host Header'),
pht(
- 'This Phabricator install is configured as "%s", but you are '.
- 'using the domain name "%s" to access a page which is trying to '.
- 'set a cookie. Access Phabricator on the configured primary '.
- 'domain or a configured alternate domain. Phabricator will not '.
- 'set cookies on other domains for security reasons.',
+ 'This server is configured as "%s", but you are using the domain '.
+ 'name "%s" to access a page which is trying to set a cookie. '.
+ 'Access this service on the configured primary domain or a '.
+ 'configured alternate domain. Cookies will not be set on other '.
+ 'domains for security reasons.',
$configured_as,
$accessed_as),
true);
diff --git a/src/aphront/configuration/AphrontApplicationConfiguration.php b/src/aphront/configuration/AphrontApplicationConfiguration.php
--- a/src/aphront/configuration/AphrontApplicationConfiguration.php
+++ b/src/aphront/configuration/AphrontApplicationConfiguration.php
@@ -419,9 +419,9 @@
throw new AphrontMalformedRequestException(
pht('No %s', 'SERVER_ADDR'),
pht(
- 'Phabricator is configured to operate in cluster mode, but '.
+ 'This service is configured to operate in cluster mode, but '.
'%s is not defined in the request context. Your webserver '.
- 'configuration needs to forward %s to PHP so Phabricator can '.
+ 'configuration needs to forward %s to PHP so the software can '.
'reject requests received on external interfaces.',
'SERVER_ADDR',
'SERVER_ADDR'));
@@ -431,7 +431,7 @@
throw new AphrontMalformedRequestException(
pht('External Interface'),
pht(
- 'Phabricator is configured in cluster mode and the address '.
+ 'This service is configured in cluster mode and the address '.
'this request was received on ("%s") is not whitelisted as '.
'a cluster address.',
$server_addr));
diff --git a/src/applications/almanac/management/AlmanacManagementRegisterWorkflow.php b/src/applications/almanac/management/AlmanacManagementRegisterWorkflow.php
--- a/src/applications/almanac/management/AlmanacManagementRegisterWorkflow.php
+++ b/src/applications/almanac/management/AlmanacManagementRegisterWorkflow.php
@@ -147,10 +147,9 @@
if (!$public_key) {
throw new PhutilArgumentUsageException(
pht(
- 'The public key corresponding to the given private key is not '.
- 'yet known to Phabricator. Associate the public key with an '.
- 'Almanac device in the web interface before registering hosts '.
- 'with it.'));
+ 'The public key corresponding to the given private key is unknown. '.
+ 'Associate the public key with an Almanac device in the web '.
+ 'interface before registering hosts with it.'));
}
if ($public_key->getObjectPHID() !== $device->getPHID()) {
diff --git a/src/applications/almanac/management/AlmanacManagementTrustKeyWorkflow.php b/src/applications/almanac/management/AlmanacManagementTrustKeyWorkflow.php
--- a/src/applications/almanac/management/AlmanacManagementTrustKeyWorkflow.php
+++ b/src/applications/almanac/management/AlmanacManagementTrustKeyWorkflow.php
@@ -61,14 +61,14 @@
phutil_console_wrap(
pht(
'Trusting a public key gives anyone holding the corresponding '.
- 'private key complete, unrestricted access to all data in '.
- 'Phabricator. The private key will be able to sign requests that '.
- 'skip policy and security checks.')),
+ 'private key complete, unrestricted access to all data. The '.
+ 'private key will be able to sign requests that bypass policy and '.
+ 'security checks.')),
phutil_console_wrap(
pht(
'This is an advanced feature which should normally be used only '.
- 'when building a Phabricator cluster. This feature is very '.
- 'dangerous if misused.')),
+ 'when building a cluster. This feature is very dangerous if '.
+ 'misused.')),
pht('This key is associated with device "%s".', $handle->getName()));
$prompt = pht(
diff --git a/src/applications/auth/controller/PhabricatorAuthConfirmLinkController.php b/src/applications/auth/controller/PhabricatorAuthConfirmLinkController.php
--- a/src/applications/auth/controller/PhabricatorAuthConfirmLinkController.php
+++ b/src/applications/auth/controller/PhabricatorAuthConfirmLinkController.php
@@ -54,8 +54,9 @@
),
pht(
'Confirm the link with this %s account. This account will be '.
- 'able to log in to your Phabricator account.',
- $provider->getProviderName())))
+ 'able to log in to your %s account.',
+ $provider->getProviderName(),
+ PlatformSymbols::getPlatformServerName())))
->appendChild(
id(new PhabricatorAuthAccountView())
->setUser($viewer)
diff --git a/src/applications/auth/controller/PhabricatorAuthLinkController.php b/src/applications/auth/controller/PhabricatorAuthLinkController.php
--- a/src/applications/auth/controller/PhabricatorAuthLinkController.php
+++ b/src/applications/auth/controller/PhabricatorAuthLinkController.php
@@ -56,8 +56,8 @@
pht('Account Already Linked'),
array(
pht(
- 'Your Phabricator account is already linked to an external '.
- 'account for this provider.'),
+ 'Your account is already linked to an external account for '.
+ 'this provider.'),
));
}
break;
diff --git a/src/applications/config/option/PhabricatorCoreConfigOptions.php b/src/applications/config/option/PhabricatorCoreConfigOptions.php
--- a/src/applications/config/option/PhabricatorCoreConfigOptions.php
+++ b/src/applications/config/option/PhabricatorCoreConfigOptions.php
@@ -86,8 +86,7 @@
->setDescription(
pht(
'If you have multiple %s environments (like a '.
- 'development/staging environment for working on testing '.
- 'Phabricator, and a production environment for deploying it), '.
+ 'development/staging environment and a production environment), '.
'set the production environment URI here so that emails and other '.
'durable URIs will always generate with links pointing at the '.
'production environment. If unset, defaults to `%s`. Most '.
diff --git a/src/applications/metamta/controller/PhabricatorMetaMTAMailViewController.php b/src/applications/metamta/controller/PhabricatorMetaMTAMailViewController.php
--- a/src/applications/metamta/controller/PhabricatorMetaMTAMailViewController.php
+++ b/src/applications/metamta/controller/PhabricatorMetaMTAMailViewController.php
@@ -119,7 +119,9 @@
if ($mail->getFrom()) {
$from_str = $viewer->renderHandle($mail->getFrom());
} else {
- $from_str = pht('Sent by Phabricator');
+ $from_str = pht(
+ 'Sent by %s',
+ PlatformSymbols::getPlatformServerName());
}
$properties->addProperty(
pht('From'),
diff --git a/src/applications/people/mail/PhabricatorPeopleWelcomeMailEngine.php b/src/applications/people/mail/PhabricatorPeopleWelcomeMailEngine.php
--- a/src/applications/people/mail/PhabricatorPeopleWelcomeMailEngine.php
+++ b/src/applications/people/mail/PhabricatorPeopleWelcomeMailEngine.php
@@ -60,7 +60,9 @@
$message = array();
- $message[] = pht('Welcome to Phabricator!');
+ $message[] = pht(
+ 'Welcome to %s!',
+ PlatformSymbols::getPlatformServerName());
$message[] = pht(
'%s (%s) has created an account for you.',
@@ -129,7 +131,9 @@
$is_serious = PhabricatorEnv::getEnvConfig('phabricator.serious-business');
if (!$is_serious) {
- return pht("Love,\nPhabricator");
+ return pht(
+ "Love,\n%s",
+ PlatformSymbols::getPlatformServerName());
}
return null;

File Metadata

Mime Type
text/plain
Expires
Sat, May 11, 8:50 AM (1 w, 4 d ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
6285271
Default Alt Text
D21777.diff (11 KB)

Event Timeline

Phabricator · Built by Phacility