Commit 6dce6c2a authored by alexpott's avatar alexpott
Browse files

Issue #2697909 by pguillard, himanshugautam, snehi, aburrows, jhodgdon: Fix...

Issue #2697909 by pguillard, himanshugautam, snehi, aburrows, jhodgdon: Fix "login (noun/adjective)" vs. "log in (verb)" in comments (and logout/log out)
parent 3d404ae1
......@@ -415,8 +415,8 @@ Drupal 7.0, 2011-01-05
are available.
- OpenID:
* Added support for Gmail and Google Apps for Domain identifiers. Users can
now login with their user@example.com identifier when example.com is powered
by Google.
now log in with their user@example.com identifier when example.com is
powered by Google.
* Made the OpenID module more pluggable.
- Added code registry:
* Using the registry, modules declare their includable files via their .info file,
......
......@@ -106,7 +106,7 @@ public function getPreferredAdminLangcode($fallback_to_default = TRUE);
* @return string
* An unsanitized plain-text string with the name of this account that is
* used to log in. Only display this name to admins and to the user who owns
* this account, and only in the context of the name used to login. For
* this account, and only in the context of the name used to log in. For
* any other display purposes, use
* \Drupal\Core\Session\AccountInterface::getDisplayName() instead.
*
......
......@@ -150,7 +150,8 @@ public function testMultipleLanguageTypes() {
$this->drupalGet('node', ['query' => ['language' => 'fr']]);
$this->assertText('Powered by Drupal', 'The body of the block appears on the page.');
// Re-login in order to clear the interface language stored in the session.
// Log in again in order to clear the interface language stored in the
// session.
$this->drupalLogout();
$this->drupalLogin($this->adminUser);
......
......@@ -42,7 +42,7 @@ public function testUpdateHookN() {
// Disable maintenance mode.
\Drupal::state()->set('system.maintenance_mode', FALSE);
// We finished updating so we can login the user now.
// We finished updating so we can log in the user now.
$this->drupalLogin($this->rootUser);
// The block that we are testing has the following visibility rules:
......
......@@ -46,7 +46,7 @@ protected function setUp() {
* Tests creating a block type programmatically and via a form.
*/
public function testBlockContentTypeCreation() {
// Login a test user.
// Log in a test user.
$this->drupalLogin($this->adminUser);
// Test the page with no block-types.
......
......@@ -377,7 +377,7 @@ function testBookExport() {
// Create a book.
$nodes = $this->createBook();
// Login as web user and view printer-friendly version.
// Log in as web user and view printer-friendly version.
$this->drupalLogin($this->webUser);
$this->drupalGet('node/' . $this->book->id());
$this->clickLink(t('Printer-friendly version'));
......@@ -735,7 +735,7 @@ public function testHookNodeLoadAccess() {
$node_storage = \Drupal::entityManager()->getStorage('node');
$node_storage->resetCache();
// Login as user without access to the book node, so no 'node test view'
// Log in as user without access to the book node, so no 'node test view'
// permission.
// @see node_access_test_node_grants().
$this->drupalLogin($this->webUserWithoutNodeAccess);
......
......@@ -15,7 +15,7 @@
/**
* Defines a class for building markup for comment links on a commented entity.
*
* Comment links include 'login to post new comment', 'add new comment' etc.
* Comment links include 'log in to post new comment', 'add new comment' etc.
*/
class CommentLinkBuilder implements CommentLinkBuilderInterface {
......
......@@ -7,7 +7,7 @@
/**
* Defines an interface for building comment links on a commented entity.
*
* Comment links include 'login to post new comment', 'add new comment' etc.
* Comment links include 'log in to post new comment', 'add new comment' etc.
*/
interface CommentLinkBuilderInterface {
......
......@@ -184,7 +184,7 @@ public function testEditComment() {
'skip comment approval',
));
// Login as a web user.
// Log in as a web user.
$this->drupalLogin($this->webUser);
// Post a comment.
$comment = $this->postComment($this->node, $this->randomMachineName());
......@@ -201,7 +201,7 @@ public function testEditComment() {
$author_mail = $this->randomMachineName() . '@example.com';
$anonymous_comment = $this->postComment($this->node, $this->randomMachineName(), $this->randomMachineName(), array('name' => $author_name, 'mail' => $author_mail));
// Login as an admin user.
// Log in as an admin user.
$this->drupalLogin($this->adminUser);
// Make sure the comment field is not visible when
......
......@@ -173,7 +173,7 @@ function testAnonymous() {
));
$this->drupalGet('node/' . $this->node->id());
$this->assertPattern('@<h2[^>]*>Comments</h2>@', 'Comments were displayed.');
$this->assertLink('Log in', 1, 'Link to log in was found.');
$this->assertLink('Log in', 1, 'Link to login was found.');
$this->assertLink('register', 1, 'Link to register was found.');
user_role_change_permissions(RoleInterface::ANONYMOUS_ID, array(
......
......@@ -32,7 +32,7 @@ protected function setUp() {
$this->drupalCreateContentType(array('type' => 'article', 'name' => 'Article'));
// Create and login user.
// Create and log in user.
$admin_user = $this->drupalCreateUser(array('administer site configuration', 'administer languages', 'access administration pages', 'administer content types', 'administer comments', 'create article content', 'access comments', 'post comments', 'skip comment approval'));
$this->drupalLogin($admin_user);
......
......@@ -356,7 +356,7 @@ function testCommentFunctionality() {
));
$this->drupalGet('entity_test/' . $this->entity->id());
$this->assertPattern('@<h2[^>]*>Comments</h2>@', 'Comments were displayed.');
$this->assertLink('Log in', 0, 'Link to log in was found.');
$this->assertLink('Log in', 0, 'Link to login was found.');
$this->assertLink('register', 0, 'Link to register was found.');
$this->assertNoFieldByName('subject[0][value]', '', 'Subject field not found.');
$this->assertNoFieldByName('comment_body[0][value]', '', 'Comment field not found.');
......
......@@ -35,7 +35,7 @@ function testCommentPreview() {
$this->setCommentSettings('default_mode', CommentManagerInterface::COMMENT_MODE_THREADED, 'Comment paging changed.');
$this->drupalLogout();
// Login as web user.
// Log in as web user.
$this->drupalLogin($this->webUser);
// Test escaping of the username on the preview form.
......@@ -86,7 +86,7 @@ public function testCommentPreviewDuplicateSubmission() {
$this->setCommentSettings('default_mode', CommentManagerInterface::COMMENT_MODE_THREADED, 'Comment paging changed.');
$this->drupalLogout();
// Login as web user.
// Log in as web user.
$this->drupalLogin($this->webUser);
// As the web user, fill in the comment form and preview the comment.
......
......@@ -54,7 +54,7 @@ public function testCommentTypeCreation() {
$comment_type = CommentType::load('other');
$this->assertTrue($comment_type, 'The new comment type has been created.');
// Login a test user.
// Log in a test user.
$this->drupalLogin($this->adminUser);
$this->drupalGet('admin/structure/comment/manage/' . $type->id());
......
......@@ -147,7 +147,7 @@ protected function doMenuListTest() {
// Test if the link to translate the menu is NOT on the page.
$this->assertNoLinkByHref($translate_link);
// Login as Admin again otherwise the rest will fail.
// Log in as Admin again otherwise the rest will fail.
$this->drupalLogin($this->adminUser);
// Test if the link to translate actually goes to the translate page.
......
......@@ -55,7 +55,7 @@ protected function setUp() {
'access contextual links',
'administer views',
);
// Create and login user.
// Create and log in user.
$this->drupalLogin($this->drupalCreateUser($permissions));
// Add languages.
......
......@@ -104,7 +104,7 @@ protected function setUp() {
'translate interface',
]
);
// Create and login user.
// Create and log in user.
$this->translatorUser = $this->drupalCreateUser($translator_permissions);
$this->adminUser = $this->drupalCreateUser($admin_permissions);
......
......@@ -42,7 +42,7 @@ protected function setUp() {
'administer site configuration',
'translate configuration',
];
// Create and login user.
// Create and log in user.
$this->adminUser = $this->drupalCreateUser($admin_permissions);
// Add languages.
......
......@@ -32,7 +32,7 @@ class ContactLanguageTest extends WebTestBase {
protected function setUp() {
parent::setUp();
// Create and login administrative user.
// Create and log in administrative user.
$admin_user = $this->drupalCreateUser(array(
'access site-wide contact form',
'administer languages',
......
......@@ -42,7 +42,7 @@ protected function setUp() {
* Tests configuration options and the site-wide contact form.
*/
function testSiteWideContact() {
// Create and login administrative user.
// Create and log in administrative user.
$admin_user = $this->drupalCreateUser(array(
'access site-wide contact form',
'administer contact forms',
......@@ -296,7 +296,7 @@ function testSiteWideContact() {
* Tests auto-reply on the site-wide contact form.
*/
function testAutoReply() {
// Create and login administrative user.
// Create and log in administrative user.
$admin_user = $this->drupalCreateUser(array('access site-wide contact form', 'administer contact forms', 'administer permissions', 'administer users'));
$this->drupalLogin($admin_user);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment