From 153f1a47f330501d70a216431ceae74e3b0b60d2 Mon Sep 17 00:00:00 2001 From: Alex Pott Date: Sun, 17 Jul 2022 10:00:33 +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 +- .../tour/tests/src/FunctionalJavascript/TourLegacyTest.php | 4 ++-- .../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 +- 15 files changed, 17 insertions(+), 17 deletions(-) diff --git a/core/core.libraries.yml b/core/core.libraries.yml index 29d2d8271aa..6d48427d8d4 100644 --- a/core/core.libraries.yml +++ b/core/core.libraries.yml @@ -415,7 +415,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 } @@ -527,7 +527,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 86abcef908b..af9a44ea2a2 100644 --- a/core/lib/Drupal/Core/Database/Database.php +++ b/core/lib/Drupal/Core/Database/Database.php @@ -443,7 +443,7 @@ abstract class Database { 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 31ed9dd8e85..1f55be5a295 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 e72cc38a719..bec182bdd62 100644 --- a/core/modules/block/tests/src/Functional/BlockTest.php +++ b/core/modules/block/tests/src/Functional/BlockTest.php @@ -163,7 +163,7 @@ class BlockTest extends BlockTestBase { '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 2c5a6bf5667..f2aff9521bb 100644 --- a/core/modules/config/tests/src/Functional/ConfigEntityTest.php +++ b/core/modules/config/tests/src/Functional/ConfigEntityTest.php @@ -189,7 +189,7 @@ class ConfigEntityTest extends BrowserTestBase { $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 afc513510ec..2d7e9f3e6b6 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
  • {% trans %}Boolean, Number (provided by the core system): Stores true/false values and numbers{% endtrans %}
  • {% trans %}Comment (provided by the core Comment module): Allows users to add comments to an entity{% endtrans %}
  • {% trans %}Date, Timestamp (Datetime module): Stores dates and times{% endtrans %}
    • -
  • {% trans %}Date range (Datetime range module): Stores time/date periods with a start and and an end{% endtrans %}
    • +
  • {% trans %}Date range (Datetime range module): Stores time/date periods with a start and an end{% endtrans %}
  • {% trans %}Email (core system): Stores email addresses{% endtrans %}
  • {% trans %}Link (Link module): Stores URLs and link text{% endtrans %}
  • {% 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 %}
    • 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 65043176efb..9f4cd2ac9c5 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:

    {% trans %}Steps{% endtrans %}

    1. {% trans %}In the Manage administrative menu, navigate to Structure > {{ views }}. A list of all views is shown.{% endtrans %}
      2. -
    2. {% trans %}Find the view that you would like to edit, and click Edit from the the dropdown button. Note that bulk operations work best in a view with a Page display, and a Table format.{% endtrans %}
      3. +
    3. {% trans %}Find the view that you would like to edit, and click Edit from the dropdown button. Note that bulk operations work best in a view with a Page display, and a Table format.{% endtrans %}
    4. {% trans %}If there is not already an Operations bulk form in the Fields list for the view, click Add in the Fields 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 operations links, 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 %}
    5. {% trans %}Check the action(s) you want to make available in the Selected actions list and click Apply (all displays).{% endtrans %}
    6. {% trans %}Verify that the Access 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 %}
      7. diff --git a/core/modules/migrate/tests/src/Kernel/MigrateSqlSourceTestBase.php b/core/modules/migrate/tests/src/Kernel/MigrateSqlSourceTestBase.php index fcae35cb646..ba11c234a66 100644 --- a/core/modules/migrate/tests/src/Kernel/MigrateSqlSourceTestBase.php +++ b/core/modules/migrate/tests/src/Kernel/MigrateSqlSourceTestBase.php @@ -97,7 +97,7 @@ abstract class MigrateSqlSourceTestBase extends MigrateSourceTestBase { /** @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/modules/tour/tests/src/FunctionalJavascript/TourLegacyTest.php b/core/modules/tour/tests/src/FunctionalJavascript/TourLegacyTest.php index eefdc4d52c9..2217f73bd38 100644 --- a/core/modules/tour/tests/src/FunctionalJavascript/TourLegacyTest.php +++ b/core/modules/tour/tests/src/FunctionalJavascript/TourLegacyTest.php @@ -135,9 +135,9 @@ class TourLegacyTest extends WebDriverTestBase { */ public function providerTestTourTipMarkup() { return [ - 'Using the the deprecated TipPlugin with Stable theme' => ['tour-test-legacy'], + 'Using the deprecated TipPlugin with Stable theme' => ['tour-test-legacy'], 'Using current TourTipPlugin with Stable theme' => ['tour-test-1'], - 'Using the the deprecated TipPlugin with Stable 9 theme' => ['tour-test-legacy', 'stable9'], + 'Using the deprecated TipPlugin with Stable 9 theme' => ['tour-test-legacy', 'stable9'], 'Using current TourTipPlugin with Stable 9 theme' => ['tour-test-1', 'stable9'], ]; } diff --git a/core/tests/Drupal/FunctionalTests/Libraries/JqueryUiLibraryAssetsTest.php b/core/tests/Drupal/FunctionalTests/Libraries/JqueryUiLibraryAssetsTest.php index 2c9277229f1..5d4c3d9dfab 100644 --- a/core/tests/Drupal/FunctionalTests/Libraries/JqueryUiLibraryAssetsTest.php +++ b/core/tests/Drupal/FunctionalTests/Libraries/JqueryUiLibraryAssetsTest.php @@ -288,7 +288,7 @@ class JqueryUiLibraryAssetsTest extends BrowserTestBase { * 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 913851b67f3..36a19d19d46 100644 --- a/core/tests/Drupal/KernelTests/Core/KeyValueStore/KeyValueContentEntityStorageTest.php +++ b/core/tests/Drupal/KernelTests/Core/KeyValueStore/KeyValueContentEntityStorageTest.php @@ -139,7 +139,7 @@ class KeyValueContentEntityStorageTest extends KernelTestBase { $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 ad768feeb43..2382283f9fe 100644 --- a/core/themes/olivero/css/components/header-search-narrow.css +++ b/core/themes/olivero/css/components/header-search-narrow.css @@ -159,7 +159,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