@@ -83,8 +83,8 @@ public function handleRequest(AphrontRequest $request) {
83
83
if (!PhabricatorUserEmail::isValidAddress ($ default_email )) {
84
84
$ errors [] = pht (
85
85
'The email address associated with this external account ("%s") is ' .
86
- 'not a valid email address and can not be used to register a ' .
87
- 'Phabricator account. Choose a different, valid address. ' ,
86
+ 'not a valid email address and can not be used to register an ' .
87
+ 'account. Choose a different, valid address. ' ,
88
88
phutil_tag ('strong ' , array (), $ default_email ));
89
89
$ default_email = null ;
90
90
}
@@ -102,8 +102,7 @@ public function handleRequest(AphrontRequest $request) {
102
102
$ errors [] = pht (
103
103
'The email address associated with this account ("%s") is ' .
104
104
'already in use by an application and can not be used to ' .
105
- 'register a new Phabricator account. Choose a different, valid ' .
106
- 'address. ' ,
105
+ 'register a new account. Choose a different, valid address. ' ,
107
106
phutil_tag ('strong ' , array (), $ default_email ));
108
107
$ default_email = null ;
109
108
}
@@ -122,8 +121,8 @@ public function handleRequest(AphrontRequest $request) {
122
121
array (
123
122
pht (
124
123
'The account you are attempting to register with has an invalid ' .
125
- 'email address (%s). This Phabricator install only allows ' .
126
- 'registration with specific email addresses: ' ,
124
+ 'email address (%s). This server only allows registration with ' .
125
+ 'specific email addresses: ' ,
127
126
$ debug_email ),
128
127
phutil_tag ('br ' ),
129
128
phutil_tag ('br ' ),
@@ -157,27 +156,29 @@ public function handleRequest(AphrontRequest $request) {
157
156
->addHiddenInput ('phase ' , 1 )
158
157
->appendParagraph (
159
158
pht (
160
- 'You are creating a new Phabricator account linked to an ' .
161
- 'existing external account from outside Phabricator . ' ))
159
+ 'You are creating a new account linked to an existing ' .
160
+ 'external account. ' ))
162
161
->appendParagraph (
163
162
pht (
164
163
'The email address ("%s") associated with the external account ' .
165
- 'is already in use by an existing Phabricator account. Multiple ' .
166
- 'Phabricator accounts may not have the same email address, so ' .
167
- 'you can not use this email address to register a new ' .
168
- 'Phabricator account. ' ,
169
- phutil_tag ('strong ' , array (), $ show_existing )))
164
+ 'is already in use by an existing %s account. Multiple ' .
165
+ '%s accounts may not have the same email address, so ' .
166
+ 'you can not use this email address to register a new account. ' ,
167
+ phutil_tag ('strong ' , array (), $ show_existing ),
168
+ PlatformSymbols::getPlatformServerName (),
169
+ PlatformSymbols::getPlatformServerName ()))
170
170
->appendParagraph (
171
171
pht (
172
172
'If you want to register a new account, continue with this ' .
173
173
'registration workflow and choose a new, unique email address ' .
174
174
'for the new account. ' ))
175
175
->appendParagraph (
176
176
pht (
177
- 'If you want to link an existing Phabricator account to this ' .
177
+ 'If you want to link an existing %s account to this ' .
178
178
'external account, do not continue. Instead: log in to your ' .
179
179
'existing account, then go to "Settings" and link the account ' .
180
- 'in the "External Accounts" panel. ' ))
180
+ 'in the "External Accounts" panel. ' ,
181
+ PlatformSymbols::getPlatformServerName ()))
181
182
->appendParagraph (
182
183
pht (
183
184
'If you continue, you will create a new account. You will not ' .
@@ -187,10 +188,10 @@ public function handleRequest(AphrontRequest $request) {
187
188
} else {
188
189
$ errors [] = pht (
189
190
'The external account you are registering with has an email address ' .
190
- 'that is already in use ("%s") by an existing Phabricator account. ' .
191
- 'Choose a new, valid email address to register a new Phabricator ' .
192
- ' account. ' ,
193
- phutil_tag ( ' strong ' , array (), $ show_existing ));
191
+ 'that is already in use ("%s") by an existing %s account. ' .
192
+ 'Choose a new, valid email address to register a new account. ' ,
193
+ phutil_tag ( ' strong ' , array (), $ show_existing ) ,
194
+ PlatformSymbols:: getPlatformServerName ( ));
194
195
}
195
196
}
196
197
@@ -595,7 +596,9 @@ public function handleRequest(AphrontRequest $request) {
595
596
596
597
if ($ is_setup ) {
597
598
$ crumbs ->addTextCrumb (pht ('Setup Admin Account ' ));
598
- $ title = pht ('Welcome to Phabricator ' );
599
+ $ title = pht (
600
+ 'Welcome to %s ' ,
601
+ PlatformSymbols::getPlatformServerName ());
599
602
} else {
600
603
$ crumbs ->addTextCrumb (pht ('Register ' ));
601
604
$ crumbs ->addTextCrumb ($ provider ->getProviderName ());
@@ -607,7 +610,10 @@ public function handleRequest(AphrontRequest $request) {
607
610
if ($ is_setup ) {
608
611
$ welcome_view = id (new PHUIInfoView ())
609
612
->setSeverity (PHUIInfoView::SEVERITY_NOTICE )
610
- ->setTitle (pht ('Welcome to Phabricator ' ))
613
+ ->setTitle (
614
+ pht (
615
+ 'Welcome to %s ' ,
616
+ PlatformSymbols::getPlatformServerName ()))
611
617
->appendChild (
612
618
pht (
613
619
'Installation is complete. Register your administrator account ' .
@@ -710,8 +716,9 @@ protected function renderError($message) {
710
716
}
711
717
712
718
private function sendWaitingForApprovalEmail (PhabricatorUser $ user ) {
713
- $ title = '[Phabricator] ' .pht (
714
- 'New User "%s" Awaiting Approval ' ,
719
+ $ title = pht (
720
+ '[%s] New User "%s" Awaiting Approval ' ,
721
+ PlatformSymbols::getPlatformServerName (),
715
722
$ user ->getUsername ());
716
723
717
724
$ body = new PhabricatorMetaMTAMailBody ();
0 commit comments