diff --git a/src/applications/nuance/source/NuancePhabricatorFormSourceDefinition.php b/src/applications/nuance/source/NuancePhabricatorFormSourceDefinition.php --- a/src/applications/nuance/source/NuancePhabricatorFormSourceDefinition.php +++ b/src/applications/nuance/source/NuancePhabricatorFormSourceDefinition.php @@ -4,7 +4,7 @@ extends NuanceSourceDefinition { public function getName() { - return pht('Phabricator Form'); + return pht('Web Form'); } public function getSourceDescription() { diff --git a/src/applications/oauthserver/application/PhabricatorOAuthServerApplication.php b/src/applications/oauthserver/application/PhabricatorOAuthServerApplication.php --- a/src/applications/oauthserver/application/PhabricatorOAuthServerApplication.php +++ b/src/applications/oauthserver/application/PhabricatorOAuthServerApplication.php @@ -23,7 +23,9 @@ } public function getFlavorText() { - return pht('Log In with Phabricator'); + return pht( + 'Log In with %s', + PlatformSymbols::getPlatformServerName()); } public function getApplicationGroup() { diff --git a/src/applications/people/controller/PhabricatorPeopleApproveController.php b/src/applications/people/controller/PhabricatorPeopleApproveController.php --- a/src/applications/people/controller/PhabricatorPeopleApproveController.php +++ b/src/applications/people/controller/PhabricatorPeopleApproveController.php @@ -52,7 +52,7 @@ ->setTitle(pht('Confirm Approval')) ->appendChild( pht( - 'Allow %s to access this Phabricator install?', + 'Allow %s to access this server?', phutil_tag('strong', array(), $user->getUsername()))) ->addCancelButton($done_uri) ->addSubmitButton(pht('Approve Account')); diff --git a/src/applications/people/controller/PhabricatorPeopleInviteSendController.php b/src/applications/people/controller/PhabricatorPeopleInviteSendController.php --- a/src/applications/people/controller/PhabricatorPeopleInviteSendController.php +++ b/src/applications/people/controller/PhabricatorPeopleInviteSendController.php @@ -77,8 +77,9 @@ $template = array(); $template[] = pht( - '%s has invited you to join Phabricator.', - $viewer->getFullName()); + '%s has invited you to join %s.', + $viewer->getFullName(), + PlatformSymbols::getPlatformServerName()); if (strlen(trim($message))) { $template[] = $message; @@ -174,7 +175,7 @@ ->setUser($viewer) ->appendRemarkupInstructions( pht( - 'To invite users to Phabricator, enter their email addresses below. '. + 'To invite users, enter their email addresses below. '. 'Separate addresses with commas or newlines.')) ->appendChild( id(new AphrontFormTextAreaControl()) diff --git a/src/applications/people/controller/PhabricatorPeopleNewController.php b/src/applications/people/controller/PhabricatorPeopleNewController.php --- a/src/applications/people/controller/PhabricatorPeopleNewController.php +++ b/src/applications/people/controller/PhabricatorPeopleNewController.php @@ -185,7 +185,9 @@ ->addCheckbox( 'welcome', 1, - pht('Send "Welcome to Phabricator" email with login instructions.'), + pht( + 'Send "Welcome to %s" email with login instructions.', + PlatformSymbols::getPlatformServerName()), $welcome_checked)); } @@ -202,15 +204,15 @@ pht( '**Why do bot accounts need an email address?**'. "\n\n". - 'Although bots do not normally receive email from Phabricator, '. - 'they can interact with other systems which require an email '. - 'address. Examples include:'. + 'Although bots do not normally receive email, they can interact '. + 'with other systems which require an email address. Examples '. + 'include:'. "\n\n". " - If the account takes actions which //send// email, we need ". " an address to use in the //From// header.\n". " - If the account creates commits, Git and Mercurial require ". " an email address for authorship.\n". - " - If you send email //to// Phabricator on behalf of the ". + " - If you send email //to// this server on behalf of the ". " account, the address can identify the sender.\n". " - Some internal authentication functions depend on accounts ". " having an email address.\n". diff --git a/src/applications/people/mail/PhabricatorPeopleEmailLoginMailEngine.php b/src/applications/people/mail/PhabricatorPeopleEmailLoginMailEngine.php --- a/src/applications/people/mail/PhabricatorPeopleEmailLoginMailEngine.php +++ b/src/applications/people/mail/PhabricatorPeopleEmailLoginMailEngine.php @@ -28,9 +28,13 @@ $is_set_password = $this->isSetPasswordWorkflow(); if ($is_set_password) { - $subject = pht('[Phabricator] Account Password Link'); + $subject = pht( + '[%s] Account Password Link', + PlatformSymbols::getPlatformServerName()); } else { - $subject = pht('[Phabricator] Account Login Link'); + $subject = pht( + '[%s] Account Login Link', + PlatformSymbols::getPlatformServerName()); } $recipient = $this->getRecipient(); @@ -72,7 +76,7 @@ $login_uri); } else if ($is_serious) { $body[] = pht( - "You can use this link to reset your Phabricator password:". + "You can use this link to reset your password:". "\n\n %s\n", $login_uri); } else { @@ -90,8 +94,7 @@ } } else { $body[] = pht( - "You can use this login link to regain access to your Phabricator ". - "account:". + "You can use this login link to regain access to your account:". "\n\n". " %s\n", $login_uri); diff --git a/src/applications/people/mail/PhabricatorPeopleUsernameMailEngine.php b/src/applications/people/mail/PhabricatorPeopleUsernameMailEngine.php --- a/src/applications/people/mail/PhabricatorPeopleUsernameMailEngine.php +++ b/src/applications/people/mail/PhabricatorPeopleUsernameMailEngine.php @@ -40,9 +40,10 @@ $body = sprintf( "%s\n\n %s\n %s\n", pht( - '%s (%s) has changed your Phabricator username.', + '%s (%s) has changed your %s username.', $sender_username, - $sender_realname), + $sender_realname, + PlatformSymbols::getPlatformServerName()), pht( 'Old Username: %s', $old_username), @@ -51,7 +52,10 @@ $new_username)); return id(new PhabricatorMetaMTAMail()) - ->setSubject(pht('[Phabricator] Username Changed')) + ->setSubject( + pht( + '[%s] Username Changed', + PlatformSymbols::getPlatformServerName())) ->setBody($body); } 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 @@ -80,10 +80,10 @@ $use_passwords = PhabricatorPasswordAuthProvider::getPasswordProvider(); if ($use_passwords) { $message[] = pht( - 'To log in to Phabricator, follow this link and set a password:'); + 'To log in, follow this link and set a password:'); $message[] = pht(' %s', $uri); $message[] = pht( - 'After you have set a password, you can log in to Phabricator in '. + 'After you have set a password, you can log in again in '. 'the future by going here:'); $message[] = pht(' %s', $base_uri); } else { @@ -91,7 +91,7 @@ 'To log in to your account for the first time, follow this link:'); $message[] = pht(' %s', $uri); $message[] = pht( - 'After you set up your account, you can log in to Phabricator in '. + 'After you set up your account, you can log in again in '. 'the future by going here:'); $message[] = pht(' %s', $base_uri); } @@ -104,7 +104,11 @@ $message = implode("\n\n", $message); return id(new PhabricatorMetaMTAMail()) - ->setSubject(pht('[Phabricator] Welcome to Phabricator')) + ->setSubject( + pht( + '[%s] Welcome to %s', + PlatformSymbols::getPlatformServerName(), + PlatformSymbols::getPlatformServerName())) ->setBody($message); } diff --git a/src/applications/people/storage/PhabricatorUserEmail.php b/src/applications/people/storage/PhabricatorUserEmail.php --- a/src/applications/people/storage/PhabricatorUserEmail.php +++ b/src/applications/people/storage/PhabricatorUserEmail.php @@ -195,7 +195,9 @@ $signature = null; if (!$is_serious) { - $signature = pht("Get Well Soon,\nPhabricator"); + $signature = pht( + "Get Well Soon,\n%s", + PlatformSymbols::getPlatformServerName()); } $body = sprintf( @@ -211,7 +213,10 @@ id(new PhabricatorMetaMTAMail()) ->addRawTos(array($address)) ->setForceDelivery(true) - ->setSubject(pht('[Phabricator] Email Verification')) + ->setSubject( + pht( + '[%s] Email Verification', + PlatformSymbols::getPlatformServerName())) ->setBody($body) ->setRelatedPHID($user->getPHID()) ->saveAndSend(); @@ -242,15 +247,18 @@ pht('Hi %s', $username), pht( 'This email address (%s) is no longer your primary email address. '. - 'Going forward, Phabricator will send all email to your new primary '. - 'email address (%s).', + 'Going forward, all email will be sent to your new primary email '. + 'address (%s).', $old_address, $new_address)); id(new PhabricatorMetaMTAMail()) ->addRawTos(array($old_address)) ->setForceDelivery(true) - ->setSubject(pht('[Phabricator] Primary Address Changed')) + ->setSubject( + pht( + '[%s] Primary Address Changed', + PlatformSymbols::getPlatformServerName())) ->setBody($body) ->setFrom($user->getPHID()) ->setRelatedPHID($user->getPHID()) @@ -276,13 +284,16 @@ pht('Hi %s', $username), pht( 'This is now your primary email address (%s). Going forward, '. - 'Phabricator will send all email here.', + 'all email will be sent here.', $new_address)); id(new PhabricatorMetaMTAMail()) ->addRawTos(array($new_address)) ->setForceDelivery(true) - ->setSubject(pht('[Phabricator] Primary Address Changed')) + ->setSubject( + pht( + '[%s] Primary Address Changed', + PlatformSymbols::getPlatformServerName())) ->setBody($body) ->setFrom($user->getPHID()) ->setRelatedPHID($user->getPHID()) diff --git a/src/applications/people/xaction/PhabricatorUserApproveTransaction.php b/src/applications/people/xaction/PhabricatorUserApproveTransaction.php --- a/src/applications/people/xaction/PhabricatorUserApproveTransaction.php +++ b/src/applications/people/xaction/PhabricatorUserApproveTransaction.php @@ -22,14 +22,16 @@ $actor = $this->getActor(); $title = pht( - 'Phabricator Account "%s" Approved', + '%s Account "%s" Approved', + PlatformSymbols::getPlatformServerName(), $user->getUsername()); $body = sprintf( "%s\n\n %s\n\n", pht( - 'Your Phabricator account (%s) has been approved by %s. You can '. + 'Your %s account (%s) has been approved by %s. You can '. 'login here:', + PlatformSymbols::getPlatformServerName(), $user->getUsername(), $actor->getUsername()), PhabricatorEnv::getProductionURI('/')); @@ -37,7 +39,11 @@ $mail = id(new PhabricatorMetaMTAMail()) ->addTos(array($user->getPHID())) ->addCCs(array($actor->getPHID())) - ->setSubject('[Phabricator] '.$title) + ->setSubject( + pht( + '[%s] %s', + PlatformSymbols::getPlatformServerName(), + $title)) ->setForceDelivery(true) ->setBody($body) ->saveAndSend();