Page MenuHomePhabricator
Files F14077958

D21778.diff
No OneTemporary
Actions

D21778.diff
View Options

diff --git a/src/applications/auth/controller/PhabricatorAuthLoginController.php b/src/applications/auth/controller/PhabricatorAuthLoginController.php
--- a/src/applications/auth/controller/PhabricatorAuthLoginController.php
+++ b/src/applications/auth/controller/PhabricatorAuthLoginController.php
@@ -80,9 +80,9 @@
} else {
return $this->renderError(
pht(
- 'The external account ("%s") you just authenticated with is '.
- 'not configured to allow logins on this Phabricator install. '.
- 'An administrator may have recently disabled it.',
+ 'The external service ("%s") you just authenticated with is '.
+ 'not configured to allow logins on this server. An '.
+ 'administrator may have recently disabled it.',
$provider->getProviderName()));
}
} else if ($viewer->getPHID() == $account->getUserPHID()) {
@@ -94,11 +94,14 @@
} else {
return $this->renderError(
pht(
- 'The external account ("%s") you just used to log in is already '.
- 'associated with another Phabricator user account. Log in to the '.
- 'other Phabricator account and unlink the external account before '.
- 'linking it to a new Phabricator account.',
- $provider->getProviderName()));
+ 'The external service ("%s") you just used to log in is already '.
+ 'associated with another %s user account. Log in to the '.
+ 'other %s account and unlink the external account before '.
+ 'linking it to a new %s account.',
+ $provider->getProviderName(),
+ PlatformSymbols::getPlatformServerName(),
+ PlatformSymbols::getPlatformServerName(),
+ PlatformSymbols::getPlatformServerName()));
}
} else {
// The account is not yet attached to a Phabricator user, so this is
@@ -109,9 +112,9 @@
} else {
return $this->renderError(
pht(
- 'The external account ("%s") you just authenticated with is '.
- 'not configured to allow registration on this Phabricator '.
- 'install. An administrator may have recently disabled it.',
+ 'The external service ("%s") you just authenticated with is '.
+ 'not configured to allow registration on this server. An '.
+ 'administrator may have recently disabled it.',
$provider->getProviderName()));
}
} else {
@@ -135,11 +138,12 @@
if ($existing_accounts) {
return $this->renderError(
pht(
- 'Your Phabricator account is already connected to an external '.
- 'account on this provider ("%s"), but you are currently logged '.
- 'in to the provider with a different account. Log out of the '.
+ 'Your %s account is already connected to an external '.
+ 'account on this service ("%s"), but you are currently logged '.
+ 'in to the service with a different account. Log out of the '.
'external service, then log back in with the correct account '.
'before refreshing the account link.',
+ PlatformSymbols::getPlatformServerName(),
$provider->getProviderName()));
}
@@ -148,9 +152,9 @@
} else {
return $this->renderError(
pht(
- 'The external account ("%s") you just authenticated with is '.
- 'not configured to allow account linking on this Phabricator '.
- 'install. An administrator may have recently disabled it.',
+ 'The external service ("%s") you just authenticated with is '.
+ 'not configured to allow account linking on this server. An '.
+ 'administrator may have recently disabled it.',
$provider->getProviderName()));
}
}
@@ -169,7 +173,8 @@
return $this->renderError(
pht(
'The external account you just logged in with is not associated '.
- 'with a valid Phabricator user.'));
+ 'with a valid %s user account.',
+ PlatformSymbols::getPlatformServerName()));
}
return $this->loginUser($user);
diff --git a/src/applications/auth/controller/PhabricatorAuthNeedsMultiFactorController.php b/src/applications/auth/controller/PhabricatorAuthNeedsMultiFactorController.php
--- a/src/applications/auth/controller/PhabricatorAuthNeedsMultiFactorController.php
+++ b/src/applications/auth/controller/PhabricatorAuthNeedsMultiFactorController.php
@@ -202,7 +202,7 @@
$messages = array();
$messages[] = pht(
- 'Before you can use Phabricator, you need to add multi-factor '.
+ 'Before you can use this software, you need to add multi-factor '.
'authentication to your account. Multi-factor authentication helps '.
'secure your account by making it more difficult for attackers to '.
'gain access or take sensitive actions.');
diff --git a/src/applications/auth/controller/PhabricatorAuthSetExternalController.php b/src/applications/auth/controller/PhabricatorAuthSetExternalController.php
--- a/src/applications/auth/controller/PhabricatorAuthSetExternalController.php
+++ b/src/applications/auth/controller/PhabricatorAuthSetExternalController.php
@@ -42,10 +42,11 @@
PhabricatorAuthLinkMessageType::MESSAGEKEY);
if (!strlen($text)) {
$text = pht(
- 'You can link your Phabricator account to an external account to '.
+ 'You can link your %s account to an external account to '.
'allow you to log in more easily in the future. To continue, choose '.
'an account to link below. If you prefer not to link your account, '.
- 'you can skip this step.');
+ 'you can skip this step.',
+ PlatformSymbols::getPlatformServerName());
}
$remarkup_view = new PHUIRemarkupView($viewer, $text);
diff --git a/src/applications/auth/controller/PhabricatorAuthStartController.php b/src/applications/auth/controller/PhabricatorAuthStartController.php
--- a/src/applications/auth/controller/PhabricatorAuthStartController.php
+++ b/src/applications/auth/controller/PhabricatorAuthStartController.php
@@ -90,11 +90,11 @@
return $this->renderError(
pht(
- 'This Phabricator install is not configured with any enabled '.
- 'authentication providers which can be used to log in. If you '.
- 'have accidentally locked yourself out by disabling all providers, '.
- 'you can use `%s` to recover access to an account.',
- 'phabricator/bin/auth recover <username>'));
+ 'This server is not configured with any enabled authentication '.
+ 'providers which can be used to log in. If you have accidentally '.
+ 'locked yourself out by disabling all providers, you can use `%s` '.
+ 'to recover access to an account.',
+ './bin/auth recover <username>'));
}
$next_uri = $request->getStr('next');
diff --git a/src/applications/auth/controller/PhabricatorAuthUnlinkController.php b/src/applications/auth/controller/PhabricatorAuthUnlinkController.php
--- a/src/applications/auth/controller/PhabricatorAuthUnlinkController.php
+++ b/src/applications/auth/controller/PhabricatorAuthUnlinkController.php
@@ -86,7 +86,7 @@
->appendChild(
pht(
'You can not unlink this account because the administrator has '.
- 'configured Phabricator to make links to "%s" accounts permanent.',
+ 'configured this server to make links to "%s" accounts permanent.',
$provider->getProviderName()))
->addCancelButton($done_uri);
}
@@ -123,7 +123,7 @@
$title = pht('Unlink "%s" Account?', $provider->getProviderName());
$body = pht(
'You will no longer be able to use your %s account to '.
- 'log in to Phabricator.',
+ 'log in.',
$provider->getProviderName());
return $this->newDialog()
diff --git a/src/applications/auth/controller/PhabricatorMustVerifyEmailController.php b/src/applications/auth/controller/PhabricatorMustVerifyEmailController.php
--- a/src/applications/auth/controller/PhabricatorMustVerifyEmailController.php
+++ b/src/applications/auth/controller/PhabricatorMustVerifyEmailController.php
@@ -34,8 +34,7 @@
$must_verify = pht(
'You must verify your email address to log in. You should have a '.
- 'new email message from Phabricator with verification instructions '.
- 'in your inbox (%s).',
+ 'new email message with verification instructions in your inbox (%s).',
phutil_tag('strong', array(), $email_address));
$send_again = pht(
diff --git a/src/applications/auth/controller/config/PhabricatorAuthDisableController.php b/src/applications/auth/controller/config/PhabricatorAuthDisableController.php
--- a/src/applications/auth/controller/config/PhabricatorAuthDisableController.php
+++ b/src/applications/auth/controller/config/PhabricatorAuthDisableController.php
@@ -49,12 +49,12 @@
if ($config->getShouldAllowRegistration()) {
$body = pht(
'Do you want to enable this provider? Users will be able to use '.
- 'their existing external accounts to register new Phabricator '.
- 'accounts and log in using linked accounts.');
+ 'their existing external accounts to register new accounts and '.
+ 'log in using linked accounts.');
} else {
$body = pht(
'Do you want to enable this provider? Users will be able to log '.
- 'in to Phabricator using linked accounts.');
+ 'in using linked accounts.');
}
$button = pht('Enable Provider');
} else {
diff --git a/src/applications/auth/controller/config/PhabricatorAuthEditController.php b/src/applications/auth/controller/config/PhabricatorAuthEditController.php
--- a/src/applications/auth/controller/config/PhabricatorAuthEditController.php
+++ b/src/applications/auth/controller/config/PhabricatorAuthEditController.php
@@ -220,7 +220,7 @@
} else {
$registration_warning = pht(
"NOTE: Any user who can browse to this install's login page will be ".
- "able to register a Phabricator account. To restrict who can register ".
+ "able to register an account. To restrict who can register ".
"an account, configure [[ %s | %s ]].",
$config_href,
$config_name);
@@ -238,10 +238,9 @@
phutil_tag('strong', array(), pht('Allow Registration:')),
' ',
pht(
- 'Allow users to register new Phabricator accounts using this '.
- 'provider. If you disable registration, users can still use this '.
- 'provider to log in to existing accounts, but will not be able to '.
- 'create new accounts.'),
+ 'Allow users to register new accounts using this provider. If you '.
+ 'disable registration, users can still use this provider to log in '.
+ 'to existing accounts, but will not be able to create new accounts.'),
);
$str_link = hsprintf(
@@ -249,29 +248,29 @@
pht('Allow Linking Accounts'),
pht(
'Allow users to link account credentials for this provider to '.
- 'existing Phabricator accounts. There is normally no reason to '.
- 'disable this unless you are trying to move away from a provider '.
- 'and want to stop users from creating new account links.'));
+ 'existing accounts. There is normally no reason to disable this '.
+ 'unless you are trying to move away from a provider and want to '.
+ 'stop users from creating new account links.'));
$str_unlink = hsprintf(
'<strong>%s:</strong> %s',
pht('Allow Unlinking Accounts'),
pht(
'Allow users to unlink account credentials for this provider from '.
- 'existing Phabricator accounts. If you disable this, Phabricator '.
- 'accounts will be permanently bound to provider accounts.'));
+ 'existing accounts. If you disable this, accounts will be '.
+ 'permanently bound to provider accounts.'));
$str_trusted_email = hsprintf(
'<strong>%s:</strong> %s',
pht('Trust Email Addresses'),
pht(
- 'Phabricator will skip email verification for accounts registered '.
+ 'Skip email verification for accounts registered '.
'through this provider.'));
$str_auto_login = hsprintf(
'<strong>%s:</strong> %s',
pht('Allow Auto Login'),
pht(
- 'Phabricator will automatically login with this provider if it is '.
+ 'Automatically log in with this provider if it is '.
'the only available provider.'));
$form = id(new AphrontFormView())
diff --git a/src/applications/auth/controller/config/PhabricatorAuthListController.php b/src/applications/auth/controller/config/PhabricatorAuthListController.php
--- a/src/applications/auth/controller/config/PhabricatorAuthListController.php
+++ b/src/applications/auth/controller/config/PhabricatorAuthListController.php
@@ -53,8 +53,7 @@
$list->setNoDataString(
pht(
'%s You have not added authentication providers yet. Use "%s" to add '.
- 'a provider, which will let users register new Phabricator accounts '.
- 'and log in.',
+ 'a provider, which will let users register new accounts and log in.',
phutil_tag(
'strong',
array(),
diff --git a/src/applications/auth/guidance/PhabricatorAuthProvidersGuidanceEngineExtension.php b/src/applications/auth/guidance/PhabricatorAuthProvidersGuidanceEngineExtension.php
--- a/src/applications/auth/guidance/PhabricatorAuthProvidersGuidanceEngineExtension.php
+++ b/src/applications/auth/guidance/PhabricatorAuthProvidersGuidanceEngineExtension.php
@@ -42,7 +42,7 @@
if ($domains_value) {
$message = pht(
- 'Phabricator is configured with an email domain whitelist (in %s), so '.
+ 'This server is configured with an email domain whitelist (in %s), so '.
'only users with a verified email address at one of these %s '.
'allowed domain(s) will be able to register an account: %s',
$domains_link,
@@ -53,7 +53,7 @@
->setMessage($message);
} else {
$message = pht(
- 'Anyone who can browse to this Phabricator install will be able to '.
+ 'Anyone who can browse to this this server will be able to '.
'register an account. To add email domain restrictions, configure '.
'%s.',
$domains_link);

File Metadata

Mime Type
text/plain
Expires
Sat, Nov 23, 1:33 AM (10 m, 28 s)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
6776663
Default Alt Text
D21778.diff (14 KB)

Event Timeline

Phabricator · Built by Phacility