@recaptime-dev's working patches + fork for Phorge, a community fork of Phabricator. (Upstream dev and stable branches are at upstream/main and upstream/stable respectively.) hq.recaptime.dev/wiki/Phorge
phorge phabricator

Use Log In vs. Login when it's a verb

Summary: Cursory research indicates that "login" is a noun, referring to a form, and "log in" is a verb, referring to the action of logging in. I went though every instances of 'login' I could find and tried to clarify all this language. Also, we have "Phabricator" on the registration for like 4-5 times, which is a bit verbose, so I tried to simplify that language as well.

Test Plan: Tested logging in and logging out. Pages feel simpler.

Reviewers: epriestley

Reviewed By: epriestley

Subscribers: Korvin

Differential Revision: https://secure.phabricator.com/D18322

+44 -45
+1 -1
src/applications/auth/controller/PhabricatorAuthFinishController.php
··· 54 54 ->addHiddenInput(AphrontRequest::TYPE_HISEC, true) 55 55 ->appendParagraph( 56 56 pht( 57 - 'Welcome, %s. To complete the login process, provide your '. 57 + 'Welcome, %s. To complete the process of logging in, provide your '. 58 58 'multi-factor credentials.', 59 59 phutil_tag('strong', array(), $viewer->getUsername()))) 60 60 ->appendChild($form->buildLayoutView())
+7 -8
src/applications/auth/controller/PhabricatorAuthLoginController.php
··· 92 92 } else { 93 93 return $this->renderError( 94 94 pht( 95 - 'The external account ("%s") you just used to login is already '. 96 - 'associated with another Phabricator user account. Login to the '. 95 + 'The external account ("%s") you just used to log in is already '. 96 + 'associated with another Phabricator user account. Log in to the '. 97 97 'other Phabricator account and unlink the external account before '. 98 98 'linking it to a new Phabricator account.', 99 99 $provider->getProviderName())); ··· 214 214 if (!$provider) { 215 215 return $this->renderError( 216 216 pht( 217 - 'The account you are attempting to login with uses a nonexistent '. 217 + 'The account you are attempting to log in with uses a nonexistent '. 218 218 'or disabled authentication provider (with key "%s"). An '. 219 219 'administrator may have recently disabled this provider.', 220 220 $this->providerKey)); ··· 240 240 if ($this->getRequest()->getUser()->isLoggedIn()) { 241 241 $crumbs->addTextCrumb(pht('Link Account'), $provider->getSettingsURI()); 242 242 } else { 243 - $crumbs->addTextCrumb(pht('Login'), $this->getApplicationURI('start/')); 243 + $crumbs->addTextCrumb(pht('Log In'), $this->getApplicationURI('start/')); 244 244 } 245 245 246 246 $crumbs->addTextCrumb($provider->getProviderName()); 247 247 $crumbs->setBorder(true); 248 248 249 249 return $this->newPage() 250 - ->setTitle(pht('Login')) 250 + ->setTitle(pht('Log In')) 251 251 ->setCrumbs($crumbs) 252 252 ->appendChild($content); 253 253 } ··· 257 257 $message) { 258 258 259 259 $message = pht( 260 - 'Authentication provider ("%s") encountered an error during login. %s', 261 - $provider->getProviderName(), 262 - $message); 260 + 'Authentication provider ("%s") encountered an error while attempting '. 261 + 'to log in. %s', $provider->getProviderName(), $message); 263 262 264 263 return $this->renderError($message); 265 264 }
+3 -3
src/applications/auth/controller/PhabricatorAuthOneTimeLoginController.php
··· 68 68 69 69 if (!$token) { 70 70 return $this->newDialog() 71 - ->setTitle(pht('Unable to Login')) 71 + ->setTitle(pht('Unable to Log In')) 72 72 ->setShortTitle(pht('Login Failure')) 73 73 ->appendParagraph( 74 74 pht( ··· 170 170 case PhabricatorAuthSessionEngine::ONETIME_USERNAME: 171 171 case PhabricatorAuthSessionEngine::ONETIME_RESET: 172 172 default: 173 - $title = pht('Login to Phabricator'); 173 + $title = pht('Log in to Phabricator'); 174 174 break; 175 175 } 176 176 ··· 193 193 194 194 $dialog = $this->newDialog() 195 195 ->setTitle($title) 196 - ->addSubmitButton(pht('Login (%s)', $target_user->getUsername())) 196 + ->addSubmitButton(pht('Log In (%s)', $target_user->getUsername())) 197 197 ->addCancelButton('/'); 198 198 199 199 foreach ($body as $paragraph) {
+4 -4
src/applications/auth/controller/PhabricatorAuthRegisterController.php
··· 483 483 if ($can_edit_username) { 484 484 $form->appendChild( 485 485 id(new AphrontFormTextControl()) 486 - ->setLabel(pht('Phabricator Username')) 486 + ->setLabel(pht('Username')) 487 487 ->setName('username') 488 488 ->setValue($value_username) 489 489 ->setError($e_username)); 490 490 } else { 491 491 $form->appendChild( 492 492 id(new AphrontFormMarkupControl()) 493 - ->setLabel(pht('Phabricator Username')) 493 + ->setLabel(pht('Username')) 494 494 ->setValue($value_username) 495 495 ->setError($e_username)); 496 496 } ··· 546 546 } else { 547 547 $submit 548 548 ->addCancelButton($this->getApplicationURI('start/')) 549 - ->setValue(pht('Register Phabricator Account')); 549 + ->setValue(pht('Register Account')); 550 550 } 551 551 552 552 ··· 560 560 } else { 561 561 $crumbs->addTextCrumb(pht('Register')); 562 562 $crumbs->addTextCrumb($provider->getProviderName()); 563 - $title = pht('Phabricator Registration'); 563 + $title = pht('Create a New Account'); 564 564 } 565 565 $crumbs->setBorder(true); 566 566
+3 -3
src/applications/auth/controller/PhabricatorAuthStartController.php
··· 198 198 $crumbs->addTextCrumb(pht('Login')); 199 199 $crumbs->setBorder(true); 200 200 201 - $title = pht('Login to Phabricator'); 201 + $title = pht('Login'); 202 202 $view = array( 203 203 $header, 204 204 $invite_message, ··· 239 239 240 240 return $this->newDialog() 241 241 ->setTitle(pht('Login Required')) 242 - ->appendParagraph(pht('You must login to take this action.')) 243 - ->addSubmitButton(pht('Login')) 242 + ->appendParagraph(pht('You must log in to take this action.')) 243 + ->addSubmitButton(pht('Log In')) 244 244 ->addCancelButton('/'); 245 245 } 246 246
+1 -1
src/applications/auth/controller/PhabricatorAuthUnlinkController.php
··· 104 104 pht( 105 105 'You can not unlink this account because you have no other '. 106 106 'valid login accounts. If you removed it, you would be unable '. 107 - 'to login. Add another authentication method before removing '. 107 + 'to log in. Add another authentication method before removing '. 108 108 'this one.')) 109 109 ->addCancelButton($this->getDoneURI()); 110 110
+1 -1
src/applications/auth/controller/PhabricatorEmailLoginController.php
··· 114 114 ->setTitle(pht('Check Your Email')) 115 115 ->setShortTitle(pht('Email Sent')) 116 116 ->appendParagraph( 117 - pht('An email has been sent with a link you can use to login.')) 117 + pht('An email has been sent with a link you can use to log in.')) 118 118 ->addCancelButton('/', pht('Done')); 119 119 } 120 120 }
+2 -2
src/applications/auth/controller/PhabricatorLogoutController.php
··· 52 52 53 53 if ($viewer->getPHID()) { 54 54 return $this->newDialog() 55 - ->setTitle(pht('Log out of Phabricator?')) 55 + ->setTitle(pht('Log Out?')) 56 56 ->appendChild(pht('Are you sure you want to log out?')) 57 - ->addSubmitButton(pht('Logout')) 57 + ->addSubmitButton(pht('Log Out')) 58 58 ->addCancelButton('/'); 59 59 } 60 60
+1 -1
src/applications/auth/controller/PhabricatorMustVerifyEmailController.php
··· 33 33 } 34 34 35 35 $must_verify = pht( 36 - 'You must verify your email address to login. You should have a '. 36 + 'You must verify your email address to log in. You should have a '. 37 37 'new email message from Phabricator with verification instructions '. 38 38 'in your inbox (%s).', 39 39 phutil_tag('strong', array(), $email_address));
+3 -3
src/applications/auth/provider/PhabricatorAuthProvider.php
··· 389 389 * @param AphrontRequest HTTP request. 390 390 * @param string Request mode string. 391 391 * @param map Additional parameters, see above. 392 - * @return wild Login button. 392 + * @return wild Log in button. 393 393 */ 394 394 protected function renderStandardLoginButton( 395 395 AphrontRequest $request, ··· 414 414 } else if ($mode == 'invite') { 415 415 $button_text = pht('Register Account'); 416 416 } else if ($this->shouldAllowRegistration()) { 417 - $button_text = pht('Login or Register'); 417 + $button_text = pht('Log In or Register'); 418 418 } else { 419 - $button_text = pht('Login'); 419 + $button_text = pht('Log In'); 420 420 } 421 421 422 422 $icon = id(new PHUIIconView())
+9 -9
src/applications/auth/provider/PhabricatorLDAPAuthProvider.php
··· 80 80 $dialog->addCancelButton($this->getSettingsURI()); 81 81 } else { 82 82 if ($this->shouldAllowRegistration()) { 83 - $dialog->setTitle(pht('Login or Register with LDAP')); 84 - $dialog->addSubmitButton(pht('Login or Register')); 83 + $dialog->setTitle(pht('Log In or Register with LDAP')); 84 + $dialog->addSubmitButton(pht('Log In or Register')); 85 85 } else { 86 - $dialog->setTitle(pht('Login with LDAP')); 87 - $dialog->addSubmitButton(pht('Login')); 86 + $dialog->setTitle(pht('Log In with LDAP')); 87 + $dialog->addSubmitButton(pht('Log In')); 88 88 } 89 89 if ($mode == 'login') { 90 90 $dialog->addCancelButton($this->getStartURI()); ··· 315 315 "credentials (which is more complicated, but more powerful).\n\n". 316 316 "For many installs, direct binding is sufficient. However, you may ". 317 317 "want to search first if:\n\n". 318 - " - You want users to be able to login with either their username ". 318 + " - You want users to be able to log in with either their username ". 319 319 " or their email address.\n". 320 320 " - The login/username is not part of the distinguished name in ". 321 321 " your LDAP records.\n". ··· 344 344 "`sn`, which will work the same way direct binding works:\n\n". 345 345 " lang=text,name=Simple Example\n". 346 346 " sn\n\n". 347 - "A slightly more complex configuration might let the user login with ". 347 + "A slightly more complex configuration might let the user log in with ". 348 348 "either their login name or email address:\n\n". 349 349 " lang=text,name=Match Several Attributes\n". 350 350 " mail\n". 351 351 " sn\n\n". 352 352 "If your LDAP directory is more complex, or you want to perform ". 353 353 "sophisticated filtering, you can use more complex queries. Depending ". 354 - "on your directory structure, this example might allow users to login ". 355 - "with either their email address or username, but only if they're in ". 356 - "specific departments:\n\n". 354 + "on your directory structure, this example might allow users to log ". 355 + "in with either their email address or username, but only if they're ". 356 + "in specific departments:\n\n". 357 357 " lang=text,name=Complex Example\n". 358 358 " (&(mail=\${login})(|(departmentNumber=1)(departmentNumber=2)))\n". 359 359 " (&(sn=\${login})(|(departmentNumber=1)(departmentNumber=2)))\n\n".
+3 -3
src/applications/auth/provider/PhabricatorPasswordAuthProvider.php
··· 100 100 101 101 public function getDescriptionForCreate() { 102 102 return pht( 103 - 'Allow users to login or register using a username and password.'); 103 + 'Allow users to log in or register using a username and password.'); 104 104 } 105 105 106 106 public function getAdapter() { ··· 174 174 $dialog = id(new AphrontDialogView()) 175 175 ->setSubmitURI($this->getLoginURI()) 176 176 ->setUser($viewer) 177 - ->setTitle(pht('Login to Phabricator')) 178 - ->addSubmitButton(pht('Login')); 177 + ->setTitle(pht('Log In')) 178 + ->addSubmitButton(pht('Log In')); 179 179 180 180 if ($this->shouldAllowRegistration()) { 181 181 $dialog->addCancelButton(
+1 -1
src/applications/conpherence/controller/ConpherenceViewController.php
··· 195 195 ->appendChild( 196 196 id(new PHUIButtonView()) 197 197 ->setTag('a') 198 - ->setText(pht('Login to Participate')) 198 + ->setText(pht('Log In to Participate')) 199 199 ->setHref((string)$login_href)); 200 200 } 201 201 }
+1 -1
src/applications/files/controller/PhabricatorFileLightboxController.php
··· 76 76 ->appendChild( 77 77 id(new PHUIButtonView()) 78 78 ->setTag('a') 79 - ->setText(pht('Login to Comment')) 79 + ->setText(pht('Log In to Comment')) 80 80 ->setHref((string)$login_href)); 81 81 } 82 82
+1 -1
src/applications/oauthserver/application/PhabricatorOAuthServerApplication.php
··· 23 23 } 24 24 25 25 public function getFlavorText() { 26 - return pht('Login with Phabricator'); 26 + return pht('Log In with Phabricator'); 27 27 } 28 28 29 29 public function getApplicationGroup() {
+1 -1
src/applications/ponder/view/PonderAddAnswerView.php
··· 72 72 ->appendChild( 73 73 id(new PHUIButtonView()) 74 74 ->setTag('a') 75 - ->setText(pht('Login to Answer')) 75 + ->setText(pht('Log In to Answer')) 76 76 ->setHref((string)$login_href)); 77 77 } 78 78
+1 -1
src/applications/transactions/view/PhabricatorApplicationTransactionCommentView.php
··· 199 199 'class' => 'login-to-comment button', 200 200 'href' => $uri, 201 201 ), 202 - pht('Login to Comment'))); 202 + pht('Log In to Comment'))); 203 203 } 204 204 205 205 $data = array();
+1 -1
src/applications/uiexample/examples/PHUIButtonExample.php
··· 158 158 ->setSize(PHUIButtonView::BIG) 159 159 ->setColor(PHUIButtonView::GREY) 160 160 ->setIcon($image) 161 - ->setText(pht('Login or Register')) 161 + ->setText(pht('Log In or Register')) 162 162 ->setSubtext($icon) 163 163 ->addClass(PHUI::MARGIN_MEDIUM_RIGHT); 164 164 }