Unverified Commit 3b668ff1 authored by alexpott's avatar alexpott

Issue #3138766 by mohrerao, longwave, sja112, jameszhang023, Lal_,...

Issue #3138766 by mohrerao, longwave, sja112, jameszhang023, Lal_, ravi.shankar, jungle, xjm: Fix "Don't" relevant typos in core
parent d6d3b9db
...@@ -67,10 +67,10 @@ public function setUp(): void { ...@@ -67,10 +67,10 @@ public function setUp(): void {
$this->savePaintings([ $this->savePaintings([
['colors' => ['red'], 'shapes' => ['triangle'], 'title' => 'FIND'], ['colors' => ['red'], 'shapes' => ['triangle'], 'title' => 'FIND'],
['colors' => ['orange'], 'shapes' => ['circle'], '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' => ['square'], 'title' => 'FIND'],
['colors' => ['yellow'], 'shapes' => ['triangle'], 'title' => 'DONT_FIND'], ['colors' => ['yellow'], 'shapes' => ['triangle'], 'title' => 'DO_NOT_FIND'],
['colors' => ['orange'], 'shapes' => ['square'], 'title' => 'DONT_FIND'], ['colors' => ['orange'], 'shapes' => ['square'], 'title' => 'DO_NOT_FIND'],
]); ]);
$this->nodeStorage = $this->container->get('entity_type.manager')->getStorage('node'); $this->nodeStorage = $this->container->get('entity_type.manager')->getStorage('node');
......
...@@ -21,8 +21,8 @@ function migrate_prepare_row_test_migrate_prepare_row(Row $row, MigrateSourceInt ...@@ -21,8 +21,8 @@ function migrate_prepare_row_test_migrate_prepare_row(Row $row, MigrateSourceInt
// Record mapping but don't record a message. // Record mapping but don't record a message.
throw new MigrateSkipRowException('', TRUE); 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. // 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);
} }
} }
...@@ -25,7 +25,7 @@ public function transform($value, MigrateExecutableInterface $migrate_executable ...@@ -25,7 +25,7 @@ public function transform($value, MigrateExecutableInterface $migrate_executable
if ($data == 'skip_and_record (use plugin)') { if ($data == 'skip_and_record (use plugin)') {
throw new MigrateSkipRowException('', TRUE); 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); throw new MigrateSkipRowException('', FALSE);
} }
return $value; return $value;
......
...@@ -33,7 +33,7 @@ public function testPrepareRowSkip() { ...@@ -33,7 +33,7 @@ public function testPrepareRowSkip() {
'plugin' => 'embedded_data', 'plugin' => 'embedded_data',
'data_rows' => [ 'data_rows' => [
['id' => '1', 'data' => 'skip_and_record'], ['id' => '1', 'data' => 'skip_and_record'],
['id' => '2', 'data' => 'skip_and_dont_record'], ['id' => '2', 'data' => 'skip_and_do_not_record'],
], ],
'ids' => [ 'ids' => [
'id' => ['type' => 'string'], 'id' => ['type' => 'string'],
...@@ -69,7 +69,7 @@ public function testPrepareRowSkip() { ...@@ -69,7 +69,7 @@ public function testPrepareRowSkip() {
$messages = $id_map_plugin->getMessages(['id' => 2])->fetchAll(); $messages = $id_map_plugin->getMessages(['id' => 2])->fetchAll();
$this->assertCount(1, $messages); $this->assertCount(1, $messages);
$message = reset($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); $this->assertEquals(MigrationInterface::MESSAGE_INFORMATIONAL, $message->level);
// Insert a custom processor in the process flow. // Insert a custom processor in the process flow.
...@@ -80,7 +80,7 @@ public function testPrepareRowSkip() { ...@@ -80,7 +80,7 @@ public function testPrepareRowSkip() {
// Change data to avoid triggering again hook_migrate_prepare_row(). // Change data to avoid triggering again hook_migrate_prepare_row().
$definition['source']['data_rows'] = [ $definition['source']['data_rows'] = [
['id' => '1', 'data' => 'skip_and_record (use plugin)'], ['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); $migration = \Drupal::service('plugin.manager.migration')->createStubMigration($definition);
......
...@@ -56,7 +56,7 @@ protected function setUp(): void { ...@@ -56,7 +56,7 @@ protected function setUp(): void {
public function testSearchLabelXSS() { public function testSearchLabelXSS() {
$this->drupalLogin($this->drupalCreateUser(['administer search'])); $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->drupalPostForm('admin/config/search/pages/manage/node_search', $keys, t('Save search page'));
$this->drupalLogin($this->searchingUser); $this->drupalLogin($this->searchingUser);
......
...@@ -66,11 +66,11 @@ session_test.set_message: ...@@ -66,11 +66,11 @@ session_test.set_message:
requirements: requirements:
_access: 'TRUE' _access: 'TRUE'
session_test.set_message_but_dont_save: session_test.set_message_but_do_not_save:
path: '/session-test/set-message-but-dont-save' path: '/session-test/set-message-but-do-not-save'
defaults: defaults:
_title: 'Set message but do not save session' _title: 'Set message but do not save session'
_controller: '\Drupal\session_test\Controller\SessionTestController::setMessageButDontSave' _controller: '\Drupal\session_test\Controller\SessionTestController::setMessageButDoNotSave'
requirements: requirements:
_access: 'TRUE' _access: 'TRUE'
......
...@@ -124,7 +124,7 @@ public function setMessage() { ...@@ -124,7 +124,7 @@ public function setMessage() {
* @return string * @return string
* A notification message. * A notification message.
*/ */
public function setMessageButDontSave() { public function setMessageButDoNotSave() {
\Drupal::service('session_handler.write_safe')->setSessionWritable(FALSE); \Drupal::service('session_handler.write_safe')->setSessionWritable(FALSE);
$this->setMessage(); $this->setMessage();
return ['#markup' => '']; return ['#markup' => ''];
......
...@@ -213,7 +213,7 @@ public function testEmptyAnonymousSession() { ...@@ -213,7 +213,7 @@ public function testEmptyAnonymousSession() {
$this->assertNull($this->drupalGetHeader('Set-Cookie'), 'New session was not started.'); $this->assertNull($this->drupalGetHeader('Set-Cookie'), 'New session was not started.');
// Verify that no session is created if drupal_save_session(FALSE) is called. // 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->assertSessionCookie(FALSE);
$this->assertSessionEmpty(TRUE); $this->assertSessionEmpty(TRUE);
......
...@@ -111,10 +111,10 @@ public function testReadWriteConfig() { ...@@ -111,10 +111,10 @@ public function testReadWriteConfig() {
$this->assertEqual($config->get($nested_array_key), $array_value, 'Nested array configuration value found.'); $this->assertEqual($config->get($nested_array_key), $array_value, 'Nested array configuration value found.');
// Read a top level value that doesn't exist. // 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. // 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. // Read false value.
$this->assertFalse($config->get($false_key), "Boolean FALSE value returned the FALSE."); $this->assertFalse($config->get($false_key), "Boolean FALSE value returned the FALSE.");
......
...@@ -92,7 +92,7 @@ body.drag { ...@@ -92,7 +92,7 @@ body.drag {
border-bottom: none; 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 { .add-new .tabledrag-changed {
display: none; display: none;
......
...@@ -36,7 +36,7 @@ body.drag { ...@@ -36,7 +36,7 @@ body.drag {
.tabledrag-changed.tabledrag-changed { .tabledrag-changed.tabledrag-changed {
border-bottom: none; 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 { .add-new .tabledrag-changed {
display: none; display: none;
} }
......
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