Skip to content

Commit

Permalink
Issue #3138766 by mohrerao, longwave, sja112, jameszhang023, Lal_, ra…
Browse files Browse the repository at this point in the history
…vi.shankar, jungle, xjm: Fix "Don't" relevant typos in core

(cherry picked from commit 3b668ff177e2872500060e657cd31dbe853541bc)
  • Loading branch information
alexpott committed Jul 31, 2020
1 parent 0e5ff82 commit 693555f
Show file tree
Hide file tree
Showing 11 changed files with 19 additions and 19 deletions.
6 changes: 3 additions & 3 deletions modules/jsonapi/tests/src/Kernel/Query/FilterTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -67,10 +67,10 @@ public function setUp() {
$this->savePaintings([
['colors' => ['red'], 'shapes' => ['triangle'], 'title' => 'FIND'],
['colors' => ['orange'], 'shapes' => ['circle'], 'title' => 'FIND'],
['colors' => ['orange'], 'shapes' => ['triangle'], 'title' => 'DONT_FIND'],
['colors' => ['orange'], 'shapes' => ['triangle'], 'title' => 'DO_NOT_FIND'],
['colors' => ['yellow'], 'shapes' => ['square'], 'title' => 'FIND'],
['colors' => ['yellow'], 'shapes' => ['triangle'], 'title' => 'DONT_FIND'],
['colors' => ['orange'], 'shapes' => ['square'], 'title' => 'DONT_FIND'],
['colors' => ['yellow'], 'shapes' => ['triangle'], 'title' => 'DO_NOT_FIND'],
['colors' => ['orange'], 'shapes' => ['square'], 'title' => 'DO_NOT_FIND'],
]);

$this->nodeStorage = $this->container->get('entity_type.manager')->getStorage('node');
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ function migrate_prepare_row_test_migrate_prepare_row(Row $row, MigrateSourceInt
// Record mapping but don't record a message.
throw new MigrateSkipRowException('', TRUE);
}
elseif ($data == 'skip_and_dont_record') {
elseif ($data == 'skip_and_do_not_record') {
// Don't record mapping but record a message.
throw new MigrateSkipRowException('skip_and_dont_record message', FALSE);
throw new MigrateSkipRowException('skip_and_do_not_record message', FALSE);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ public function transform($value, MigrateExecutableInterface $migrate_executable
if ($data == 'skip_and_record (use plugin)') {
throw new MigrateSkipRowException('', TRUE);
}
elseif ($data == 'skip_and_dont_record (use plugin)') {
elseif ($data == 'skip_and_do_not_record (use plugin)') {
throw new MigrateSkipRowException('', FALSE);
}
return $value;
Expand Down
6 changes: 3 additions & 3 deletions modules/migrate/tests/src/Kernel/MigrateSkipRowTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ public function testPrepareRowSkip() {
'plugin' => 'embedded_data',
'data_rows' => [
['id' => '1', 'data' => 'skip_and_record'],
['id' => '2', 'data' => 'skip_and_dont_record'],
['id' => '2', 'data' => 'skip_and_do_not_record'],
],
'ids' => [
'id' => ['type' => 'string'],
Expand Down Expand Up @@ -69,7 +69,7 @@ public function testPrepareRowSkip() {
$messages = $id_map_plugin->getMessages(['id' => 2])->fetchAll();
$this->assertCount(1, $messages);
$message = reset($messages);
$this->assertEquals('skip_and_dont_record message', $message->message);
$this->assertEquals('skip_and_do_not_record message', $message->message);
$this->assertEquals(MigrationInterface::MESSAGE_INFORMATIONAL, $message->level);

// Insert a custom processor in the process flow.
Expand All @@ -80,7 +80,7 @@ public function testPrepareRowSkip() {
// Change data to avoid triggering again hook_migrate_prepare_row().
$definition['source']['data_rows'] = [
['id' => '1', 'data' => 'skip_and_record (use plugin)'],
['id' => '2', 'data' => 'skip_and_dont_record (use plugin)'],
['id' => '2', 'data' => 'skip_and_do_not_record (use plugin)'],
];
$migration = \Drupal::service('plugin.manager.migration')->createStubMigration($definition);

Expand Down
2 changes: 1 addition & 1 deletion modules/search/tests/src/Functional/SearchPageTextTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ protected function setUp() {
public function testSearchLabelXSS() {
$this->drupalLogin($this->drupalCreateUser(['administer search']));

$keys['label'] = '<script>alert("Dont Panic");</script>';
$keys['label'] = '<script>alert("Don\'t Panic");</script>';
$this->drupalPostForm('admin/config/search/pages/manage/node_search', $keys, t('Save search page'));

$this->drupalLogin($this->searchingUser);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -66,11 +66,11 @@ session_test.set_message:
requirements:
_access: 'TRUE'

session_test.set_message_but_dont_save:
path: '/session-test/set-message-but-dont-save'
session_test.set_message_but_do_not_save:
path: '/session-test/set-message-but-do-not-save'
defaults:
_title: 'Set message but do not save session'
_controller: '\Drupal\session_test\Controller\SessionTestController::setMessageButDontSave'
_controller: '\Drupal\session_test\Controller\SessionTestController::setMessageButDoNotSave'
requirements:
_access: 'TRUE'

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ public function setMessage() {
* @return string
* A notification message.
*/
public function setMessageButDontSave() {
public function setMessageButDoNotSave() {
\Drupal::service('session_handler.write_safe')->setSessionWritable(FALSE);
$this->setMessage();
return ['#markup' => ''];
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,7 @@ public function testEmptyAnonymousSession() {
$this->assertNull($this->drupalGetHeader('Set-Cookie'), 'New session was not started.');

// Verify that no session is created if drupal_save_session(FALSE) is called.
$this->drupalGet('session-test/set-message-but-dont-save');
$this->drupalGet('session-test/set-message-but-do-not-save');
$this->assertSessionCookie(FALSE);
$this->assertSessionEmpty(TRUE);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -111,10 +111,10 @@ public function testReadWriteConfig() {
$this->assertEqual($config->get($nested_array_key), $array_value, 'Nested array configuration value found.');

// Read a top level value that doesn't exist.
$this->assertNull($config->get('i_dont_exist'), 'Non-existent top level value returned NULL.');
$this->assertNull($config->get('i_do_not_exist'), 'Non-existent top level value returned NULL.');

// Read a nested value that doesn't exist.
$this->assertNull($config->get('i.dont.exist'), 'Non-existent nested value returned NULL.');
$this->assertNull($config->get('i.do.not.exist'), 'Non-existent nested value returned NULL.');

// Read false value.
$this->assertFalse($config->get($false_key), "Boolean FALSE value returned the FALSE.");
Expand Down
2 changes: 1 addition & 1 deletion themes/claro/css/components/tabledrag.css
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ body.drag {
border-bottom: none;
}

/* Dont display the abbreviation of 'add-new' table rows. */
/* Don't display the abbreviation of 'add-new' table rows. */

.add-new .tabledrag-changed {
display: none;
Expand Down
2 changes: 1 addition & 1 deletion themes/claro/css/components/tabledrag.pcss.css
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ body.drag {
.tabledrag-changed.tabledrag-changed {
border-bottom: none;
}
/* Dont display the abbreviation of 'add-new' table rows. */
/* Don't display the abbreviation of 'add-new' table rows. */
.add-new .tabledrag-changed {
display: none;
}
Expand Down

0 comments on commit 693555f

Please sign in to comment.