From 5d4b6b4a87ba251d6d145a911e7069a38edcfb1c Mon Sep 17 00:00:00 2001
From: Alex Pott <alex.a.pott@googlemail.com>
Date: Sun, 17 Jul 2022 09:58:52 +0100
Subject: [PATCH] Issue #3283602 by urvashi_vora, eleonel, mrinalini9,
ankithashetty, alexpott, Munavijayalakshmi: Fix repeated words
---
core/core.libraries.yml | 4 ++--
core/lib/Drupal/Core/Database/Database.php | 2 +-
core/lib/Drupal/Core/Utility/Error.php | 2 +-
core/modules/block/tests/src/Functional/BlockTest.php | 2 +-
core/modules/config/tests/src/Functional/ConfigEntityTest.php | 2 +-
.../help_topics/help_topics/core.content_structure.html.twig | 2 +-
.../help_topics/views_ui.bulk_operations.html.twig | 2 +-
.../migrate/tests/src/Kernel/MigrateSqlSourceTestBase.php | 2 +-
.../FunctionalTests/Libraries/JqueryUiLibraryAssetsTest.php | 2 +-
.../Core/KeyValueStore/KeyValueContentEntityStorageTest.php | 2 +-
core/themes/olivero/css/components/header-search-narrow.css | 2 +-
.../olivero/css/components/header-search-narrow.pcss.css | 2 +-
core/themes/olivero/css/components/header-search-wide.css | 2 +-
.../themes/olivero/css/components/header-search-wide.pcss.css | 2 +-
14 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/core/core.libraries.yml b/core/core.libraries.yml
index 3f82c2ad934d..b26bf5fff627 100644
--- a/core/core.libraries.yml
+++ b/core/core.libraries.yml
@@ -395,7 +395,7 @@ drupal.autocomplete:
misc/autocomplete.js: { weight: -1 }
# The remaining JavaScript assets previously came from core/jquery.ui, a
# deprecated library.
- # All weights are based on on the requirements defined within each file.
+ # All weights are based on the requirements defined within each file.
# @todo replace with solution in https://drupal.org/node/3076171
assets/vendor/jquery.ui/ui/widgets/autocomplete-min.js: { weight: -11.7, minified: true }
assets/vendor/jquery.ui/ui/labels-min.js: { weight: -11.7, minified: true }
@@ -494,7 +494,7 @@ drupal.dialog:
misc/dialog/dialog.jquery-ui.js: {}
# The remaining JavaScript assets previously came from core/jquery.ui, a
# deprecated library.
- # All weights are based on on the requirements defined within each file.
+ # All weights are based on the requirements defined within each file.
# @todo replace with solution in https://drupal.org/node/2158943
assets/vendor/jquery.ui/ui/widgets/dialog-min.js: { weight: -11.4, minified: true }
assets/vendor/jquery.ui/ui/widgets/button-min.js: { weight: -11.5, minified: true }
diff --git a/core/lib/Drupal/Core/Database/Database.php b/core/lib/Drupal/Core/Database/Database.php
index aca6939b7672..6493c87c5c03 100644
--- a/core/lib/Drupal/Core/Database/Database.php
+++ b/core/lib/Drupal/Core/Database/Database.php
@@ -425,7 +425,7 @@ public static function closeConnection($target = NULL, $key = NULL) {
unset(self::$connections[$key]);
}
// Force garbage collection to run. This ensures that client connection
- // objects and results in the connection being being closed are destroyed.
+ // objects and results in the connection being closed are destroyed.
gc_collect_cycles();
}
diff --git a/core/lib/Drupal/Core/Utility/Error.php b/core/lib/Drupal/Core/Utility/Error.php
index 31ed9dd8e858..1f55be5a2952 100644
--- a/core/lib/Drupal/Core/Utility/Error.php
+++ b/core/lib/Drupal/Core/Utility/Error.php
@@ -21,7 +21,7 @@ class Error {
const ERROR = 3;
/**
- * The the default message for logging errors.
+ * The default message for logging errors.
*/
const DEFAULT_ERROR_MESSAGE = '%type: @message in %function (line %line of %file).';
diff --git a/core/modules/block/tests/src/Functional/BlockTest.php b/core/modules/block/tests/src/Functional/BlockTest.php
index e72cc38a7199..bec182bdd62d 100644
--- a/core/modules/block/tests/src/Functional/BlockTest.php
+++ b/core/modules/block/tests/src/Functional/BlockTest.php
@@ -163,7 +163,7 @@ public function testAddBlockFromLibraryWithWeight() {
'theme' => $default_theme,
]);
- // Verify that one link is found, with the the expected link text.
+ // Verify that one link is found, with the expected link text.
$xpath = $this->assertSession()->buildXPathQuery('//a[contains(@href, :href)]', [':href' => $add_url->toString()]);
$this->assertSession()->elementsCount('xpath', $xpath, 1);
$this->assertSession()->elementTextEquals('xpath', $xpath, 'Place block');
diff --git a/core/modules/config/tests/src/Functional/ConfigEntityTest.php b/core/modules/config/tests/src/Functional/ConfigEntityTest.php
index 2c5a6bf56670..f2aff9521bb0 100644
--- a/core/modules/config/tests/src/Functional/ConfigEntityTest.php
+++ b/core/modules/config/tests/src/Functional/ConfigEntityTest.php
@@ -189,7 +189,7 @@ public function testCRUD() {
$this->assertTrue($same_id->isNew());
try {
$same_id->save();
- $this->fail('Not possible to overwrite an entity entity.');
+ $this->fail('Not possible to overwrite an entity.');
}
catch (EntityStorageException $e) {
// Expected exception; just continue testing.
diff --git a/core/modules/help_topics/help_topics/core.content_structure.html.twig b/core/modules/help_topics/help_topics/core.content_structure.html.twig
index afc513510eca..2d7e9f3e6b67 100644
--- a/core/modules/help_topics/help_topics/core.content_structure.html.twig
+++ b/core/modules/help_topics/help_topics/core.content_structure.html.twig
@@ -17,7 +17,7 @@ top_level: true
<li>{% trans %}Boolean, Number (provided by the core system): Stores true/false values and numbers{% endtrans %}</li>
<li>{% trans %}Comment (provided by the core Comment module): Allows users to add comments to an entity{% endtrans %}</li>
<li>{% trans %}Date, Timestamp (Datetime module): Stores dates and times{% endtrans %}</li>
- <li>{% trans %}Date range (Datetime range module): Stores time/date periods with a start and and an end{% endtrans %}</li>
+ <li>{% trans %}Date range (Datetime range module): Stores time/date periods with a start and an end{% endtrans %}</li>
<li>{% trans %}Email (core system): Stores email addresses{% endtrans %}</li>
<li>{% trans %}Link (Link module): Stores URLs and link text{% endtrans %}</li>
<li>{% trans %}List (Options module): Stores values chosen from pre-defined lists, where the values can be numbers or text; see section below for more on list fields.{% endtrans %}</li>
diff --git a/core/modules/help_topics/help_topics/views_ui.bulk_operations.html.twig b/core/modules/help_topics/help_topics/views_ui.bulk_operations.html.twig
index 65043176efbb..9f4cd2ac9c5a 100644
--- a/core/modules/help_topics/help_topics/views_ui.bulk_operations.html.twig
+++ b/core/modules/help_topics/help_topics/views_ui.bulk_operations.html.twig
@@ -22,7 +22,7 @@ related:
<h2>{% trans %}Steps{% endtrans %}</h2>
<ol>
<li>{% trans %}In the <em>Manage</em> administrative menu, navigate to <em>Structure</em> > <em>{{ views }}</em>. A list of all views is shown.{% endtrans %}</li>
- <li>{% trans %}Find the view that you would like to edit, and click <em>Edit</em> from the the dropdown button. Note that bulk operations work best in a view with a Page display, and a Table format.{% endtrans %}</li>
+ <li>{% trans %}Find the view that you would like to edit, and click <em>Edit</em> from the dropdown button. Note that bulk operations work best in a view with a Page display, and a Table format.{% endtrans %}</li>
<li>{% trans %}If there is not already an <em>Operations bulk form</em> in the <em>Fields</em> list for the view, click <em>Add</em> in the <em>Fields</em> section to add it. (The exact name of the bulk form field will vary, and may contain keywords like "bulk update", "form element" or "operations" -- not to be confused with <em>operations links</em>, which are applied to each item in a row.) If the bulk operations field already exists, click the field name to edit its settings.{% endtrans %}</li>
<li>{% trans %}Check the action(s) you want to make available in the <em>Selected actions</em> list and click <em>Apply (all displays)</em>.{% endtrans %}</li>
<li>{% trans %}Verify that the <em>Access</em> settings for the view are at least as restrictive as the permissions necessary to perform the bulk operations. People with permission to see the view, but who don't have permission to do the bulk operations, will experience problems.{% endtrans %}</li>
diff --git a/core/modules/migrate/tests/src/Kernel/MigrateSqlSourceTestBase.php b/core/modules/migrate/tests/src/Kernel/MigrateSqlSourceTestBase.php
index fcae35cb646b..ba11c234a667 100644
--- a/core/modules/migrate/tests/src/Kernel/MigrateSqlSourceTestBase.php
+++ b/core/modules/migrate/tests/src/Kernel/MigrateSqlSourceTestBase.php
@@ -97,7 +97,7 @@ public function testSource(array $source_data, array $expected_data, $expected_c
/** @var MemoryCounterBackend $cache **/
$cache = \Drupal::cache('migrate');
if ($expected_cache_key) {
- // Verify the the computed cache key.
+ // Verify the computed cache key.
$property = $reflector->getProperty('cacheKey');
$property->setAccessible(TRUE);
$this->assertSame($expected_cache_key, $property->getValue($plugin));
diff --git a/core/tests/Drupal/FunctionalTests/Libraries/JqueryUiLibraryAssetsTest.php b/core/tests/Drupal/FunctionalTests/Libraries/JqueryUiLibraryAssetsTest.php
index 2199eb217a53..f92fd3c5354e 100644
--- a/core/tests/Drupal/FunctionalTests/Libraries/JqueryUiLibraryAssetsTest.php
+++ b/core/tests/Drupal/FunctionalTests/Libraries/JqueryUiLibraryAssetsTest.php
@@ -280,7 +280,7 @@ public function testLibraryAssetLoadingOrder($library) {
* Confirms jQuery UI assets load as expected.
*
* Compares the jQuery assets that currently load against a list of the assets
- * that loaded prior to the the deprecation of all remaining core jQuery UI
+ * that loaded prior to the deprecation of all remaining core jQuery UI
* libraries.
*
* While this is similar to testLibraryAssetLoadingOrder(), it is a separate
diff --git a/core/tests/Drupal/KernelTests/Core/KeyValueStore/KeyValueContentEntityStorageTest.php b/core/tests/Drupal/KernelTests/Core/KeyValueStore/KeyValueContentEntityStorageTest.php
index 913851b67f30..36a19d19d464 100644
--- a/core/tests/Drupal/KernelTests/Core/KeyValueStore/KeyValueContentEntityStorageTest.php
+++ b/core/tests/Drupal/KernelTests/Core/KeyValueStore/KeyValueContentEntityStorageTest.php
@@ -139,7 +139,7 @@ public function testCRUD() {
$this->assertTrue($same_id->isNew());
try {
$same_id->save();
- $this->fail('Not possible to overwrite an entity entity.');
+ $this->fail('Not possible to overwrite an entity.');
}
catch (EntityStorageException $e) {
// Expected exception; just continue testing.
diff --git a/core/themes/olivero/css/components/header-search-narrow.css b/core/themes/olivero/css/components/header-search-narrow.css
index 37e66901067f..df61b64a57df 100644
--- a/core/themes/olivero/css/components/header-search-narrow.css
+++ b/core/themes/olivero/css/components/header-search-narrow.css
@@ -171,7 +171,7 @@
background-color: transparent
/*
- When in Windows high contrast mode, FF will will not output either background
+ When in Windows high contrast mode, FF will not output either background
images or SVGs that are nested directly within a <button> element, so we add a <span>.
*/
}
diff --git a/core/themes/olivero/css/components/header-search-narrow.pcss.css b/core/themes/olivero/css/components/header-search-narrow.pcss.css
index 048dfaf04428..a11654050c6e 100644
--- a/core/themes/olivero/css/components/header-search-narrow.pcss.css
+++ b/core/themes/olivero/css/components/header-search-narrow.pcss.css
@@ -85,7 +85,7 @@
background-color: transparent;
/*
- When in Windows high contrast mode, FF will will not output either background
+ When in Windows high contrast mode, FF will not output either background
images or SVGs that are nested directly within a <button> element, so we add a <span>.
*/
& .icon--search {
diff --git a/core/themes/olivero/css/components/header-search-wide.css b/core/themes/olivero/css/components/header-search-wide.css
index 861c29a79891..dc6a6b82dd6e 100644
--- a/core/themes/olivero/css/components/header-search-wide.css
+++ b/core/themes/olivero/css/components/header-search-wide.css
@@ -215,7 +215,7 @@
background-color: transparent
/*
- When in Windows high contrast mode, FF will will not output either background
+ When in Windows high contrast mode, FF will not output either background
images or SVGs that are nested directly within a <button> element, so we add a <span>.
*/
}
diff --git a/core/themes/olivero/css/components/header-search-wide.pcss.css b/core/themes/olivero/css/components/header-search-wide.pcss.css
index 198fde1a4c13..941d85d37031 100644
--- a/core/themes/olivero/css/components/header-search-wide.pcss.css
+++ b/core/themes/olivero/css/components/header-search-wide.pcss.css
@@ -102,7 +102,7 @@
background-color: transparent;
/*
- When in Windows high contrast mode, FF will will not output either background
+ When in Windows high contrast mode, FF will not output either background
images or SVGs that are nested directly within a <button> element, so we add a <span>.
*/
& .icon--search {
--
GitLab