From 026e9d8754f831af69205d317bfa414040414323 Mon Sep 17 00:00:00 2001
From: Alex Pott <alex.a.pott@googlemail.com>
Date: Tue, 18 Aug 2015 13:10:00 +0100
Subject: [PATCH] Issue #2549091 by Pravin Ajaaz, jhodgdon: Fix "associated to"
==> "associated with"
---
core/includes/entity.inc | 8 ++++----
.../Drupal/Component/Plugin/Factory/ReflectionFactory.php | 2 +-
core/lib/Drupal/Core/Entity/Entity/EntityFormDisplay.php | 2 +-
core/lib/Drupal/Core/Entity/Entity/EntityViewDisplay.php | 4 ++--
core/misc/states.js | 4 ++--
core/modules/field/src/Entity/FieldConfig.php | 2 +-
core/modules/file/file.module | 2 +-
core/modules/help/src/Controller/HelpController.php | 2 +-
core/modules/language/src/LanguageNegotiatorInterface.php | 2 +-
core/modules/menu_ui/src/Tests/MenuTest.php | 5 +++--
core/modules/rdf/rdf.module | 2 +-
.../shortcut/src/Controller/ShortcutController.php | 3 +--
.../system/tests/modules/entity_test/entity_test.module | 2 +-
.../taxonomy/src/Controller/TaxonomyController.php | 2 +-
.../src/Entity/Render/EntityTranslationRendererBase.php | 2 +-
core/modules/views/src/Plugin/views/style/Table.php | 2 +-
16 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/core/includes/entity.inc b/core/includes/entity.inc
index e66ec2d94c26..99363627ecbe 100644
--- a/core/includes/entity.inc
+++ b/core/includes/entity.inc
@@ -403,7 +403,7 @@ function entity_view_multiple(array $entities, $view_mode, $langcode = NULL, $re
}
/**
- * Returns the entity view display associated to a bundle and view mode.
+ * Returns the entity view display associated with a bundle and view mode.
*
* Use this function when assigning suggested display options for a component
* in a given view mode. Note that they will only be actually used at render
@@ -439,7 +439,7 @@ function entity_view_multiple(array $entities, $view_mode, $langcode = NULL, $re
* this bundle.
*
* @return \Drupal\Core\Entity\Display\EntityViewDisplayInterface
- * The entity view display associated to the view mode.
+ * The entity view display associated with the view mode.
*
* @deprecated as of Drupal 8.0.x, will be removed before Drupal 9.0.0.
* If the display is available in configuration use:
@@ -483,7 +483,7 @@ function entity_get_display($entity_type, $bundle, $view_mode) {
}
/**
- * Returns the entity form display associated to a bundle and form mode.
+ * Returns the entity form display associated with a bundle and form mode.
*
* The function reads the entity form display object from the current
* configuration, or returns a ready-to-use empty one if no configuration entry
@@ -515,7 +515,7 @@ function entity_get_display($entity_type, $bundle, $view_mode) {
* The form mode.
*
* @return \Drupal\Core\Entity\Display\EntityFormDisplayInterface
- * The entity form display associated to the given form mode.
+ * The entity form display associated with the given form mode.
*
* @deprecated as of Drupal 8.0.x, will be removed before Drupal 9.0.0.
* If the entity form display is available in configuration use:
diff --git a/core/lib/Drupal/Component/Plugin/Factory/ReflectionFactory.php b/core/lib/Drupal/Component/Plugin/Factory/ReflectionFactory.php
index 2dc2bf33df06..26e843a834b0 100644
--- a/core/lib/Drupal/Component/Plugin/Factory/ReflectionFactory.php
+++ b/core/lib/Drupal/Component/Plugin/Factory/ReflectionFactory.php
@@ -46,7 +46,7 @@ public function createInstance($plugin_id, array $configuration = array()) {
* @param string $plugin_id
* The identifier of the plugin implementation.
* @param mixed $plugin_definition
- * The definition associated to the plugin_id.
+ * The definition associated with the plugin_id.
* @param array $configuration
* An array of configuration that may be passed to the instance.
*
diff --git a/core/lib/Drupal/Core/Entity/Entity/EntityFormDisplay.php b/core/lib/Drupal/Core/Entity/Entity/EntityFormDisplay.php
index b020891f724b..bee014421d62 100644
--- a/core/lib/Drupal/Core/Entity/Entity/EntityFormDisplay.php
+++ b/core/lib/Drupal/Core/Entity/Entity/EntityFormDisplay.php
@@ -49,7 +49,7 @@ class EntityFormDisplay extends EntityDisplayBase implements EntityFormDisplayIn
* Returns the entity_form_display object used to build an entity form.
*
* Depending on the configuration of the form mode for the entity bundle, this
- * can be either the display object associated to the form mode, or the
+ * can be either the display object associated with the form mode, or the
* 'default' display.
*
* This method should only be used internally when rendering an entity form.
diff --git a/core/lib/Drupal/Core/Entity/Entity/EntityViewDisplay.php b/core/lib/Drupal/Core/Entity/Entity/EntityViewDisplay.php
index db56e8b85cfd..c5cf7e36503e 100644
--- a/core/lib/Drupal/Core/Entity/Entity/EntityViewDisplay.php
+++ b/core/lib/Drupal/Core/Entity/Entity/EntityViewDisplay.php
@@ -46,8 +46,8 @@ class EntityViewDisplay extends EntityDisplayBase implements EntityViewDisplayIn
* Returns the display objects used to render a set of entities.
*
* Depending on the configuration of the view mode for each bundle, this can
- * be either the display object associated to the view mode, or the 'default'
- * display.
+ * be either the display object associated with the view mode, or the
+ * 'default' display.
*
* This method should only be used internally when rendering an entity. When
* assigning suggested display options for a component in a given view mode,
diff --git a/core/misc/states.js b/core/misc/states.js
index b308a136686a..c10e3069e415 100644
--- a/core/misc/states.js
+++ b/core/misc/states.js
@@ -442,8 +442,8 @@
empty: {
// 'keyup' is the (native DOM) event that we watch for.
keyup: function () {
- // The function associated to that trigger returns the new value for the
- // state.
+ // The function associated with that trigger returns the new value for
+ // the state.
return this.val() === '';
}
},
diff --git a/core/modules/field/src/Entity/FieldConfig.php b/core/modules/field/src/Entity/FieldConfig.php
index 29c28197d78c..9f4739960f3f 100644
--- a/core/modules/field/src/Entity/FieldConfig.php
+++ b/core/modules/field/src/Entity/FieldConfig.php
@@ -78,7 +78,7 @@ class FieldConfig extends FieldConfigBase implements FieldConfigInterface {
*
* @param array $values
* An array of field properties, keyed by property name. The
- * storage associated to the field can be specified either with:
+ * storage associated with the field can be specified either with:
* - field_storage: the FieldStorageConfigInterface object,
* or by referring to an existing field storage in the current configuration
* with:
diff --git a/core/modules/file/file.module b/core/modules/file/file.module
index a995916780bb..c4163e6c4707 100644
--- a/core/modules/file/file.module
+++ b/core/modules/file/file.module
@@ -1274,7 +1274,7 @@ function template_preprocess_file_link(&$variables) {
* A MIME type.
*
* @return string
- * A class associated to the file.
+ * A class associated with the file.
*/
function file_icon_class($mime_type) {
// Search for a group with the files MIME type.
diff --git a/core/modules/help/src/Controller/HelpController.php b/core/modules/help/src/Controller/HelpController.php
index e6c3d16e670d..802f9d9c1a52 100644
--- a/core/modules/help/src/Controller/HelpController.php
+++ b/core/modules/help/src/Controller/HelpController.php
@@ -126,7 +126,7 @@ public function helpPage($name) {
}
// Only print list of administration pages if the module in question has
- // any such pages associated to it.
+ // any such pages associated with it.
$admin_tasks = system_get_module_admin_tasks($name, system_get_info('module', $name));
if (!empty($admin_tasks)) {
$links = array();
diff --git a/core/modules/language/src/LanguageNegotiatorInterface.php b/core/modules/language/src/LanguageNegotiatorInterface.php
index fbf1d27f60b4..97b064601701 100644
--- a/core/modules/language/src/LanguageNegotiatorInterface.php
+++ b/core/modules/language/src/LanguageNegotiatorInterface.php
@@ -66,7 +66,7 @@
* particular logic to return a language code. For instance, the URL method
* searches for a valid path prefix or domain name in the current request URL.
* If a language negotiation method does not return a valid language code, the
- * next method associated to the language type (based on method weight) is
+ * next method associated with the language type (based on method weight) is
* invoked.
*
* Modules can define additional language negotiation methods by simply provide
diff --git a/core/modules/menu_ui/src/Tests/MenuTest.php b/core/modules/menu_ui/src/Tests/MenuTest.php
index 34dacc5f6bd7..128d507c25cf 100644
--- a/core/modules/menu_ui/src/Tests/MenuTest.php
+++ b/core/modules/menu_ui/src/Tests/MenuTest.php
@@ -243,9 +243,10 @@ function deleteCustomMenu() {
$this->assertResponse(200);
$this->assertRaw(t('The menu %title has been deleted.', array('%title' => $label)), 'Custom menu was deleted');
$this->assertNull(Menu::load($menu_name), 'Custom menu was deleted');
- // Test if all menu links associated to the menu were removed from database.
+ // Test if all menu links associated with the menu were removed from
+ // database.
$result = entity_load_multiple_by_properties('menu_link_content', array('menu_name' => $menu_name));
- $this->assertFalse($result, 'All menu links associated to the custom menu were deleted.');
+ $this->assertFalse($result, 'All menu links associated with the custom menu were deleted.');
// Make sure there's no delete button on system menus.
$this->drupalGet('admin/structure/menu/manage/main');
diff --git a/core/modules/rdf/rdf.module b/core/modules/rdf/rdf.module
index 35ac8b8a8327..0a7e1f80f947 100644
--- a/core/modules/rdf/rdf.module
+++ b/core/modules/rdf/rdf.module
@@ -39,7 +39,7 @@ function rdf_help($route_name, RouteMatchInterface $route_match) {
* themes are coded to be RDFa compatible.
*/
/**
- * Returns the RDF mapping object associated to a bundle.
+ * Returns the RDF mapping object associated with a bundle.
*
* The function reads the rdf_mapping object from the current configuration,
* or returns a ready-to-use empty one if no configuration entry exists yet for
diff --git a/core/modules/shortcut/src/Controller/ShortcutController.php b/core/modules/shortcut/src/Controller/ShortcutController.php
index 25f32cb466d0..5e4bc68b3d72 100644
--- a/core/modules/shortcut/src/Controller/ShortcutController.php
+++ b/core/modules/shortcut/src/Controller/ShortcutController.php
@@ -18,8 +18,7 @@
class ShortcutController extends ControllerBase {
/**
- * Returns a rendered edit form to create a new shortcut associated to the
- * given shortcut set.
+ * Returns a form to add a new shortcut to a given set.
*
* @param \Drupal\shortcut\ShortcutSetInterface $shortcut_set
* The shortcut set this shortcut will be added to.
diff --git a/core/modules/system/tests/modules/entity_test/entity_test.module b/core/modules/system/tests/modules/entity_test/entity_test.module
index 1e7fa2b1f9e6..8bddd3246e4e 100644
--- a/core/modules/system/tests/modules/entity_test/entity_test.module
+++ b/core/modules/system/tests/modules/entity_test/entity_test.module
@@ -600,7 +600,7 @@ function entity_test_field_default_value(FieldableEntityInterface $entity, Field
* @param string $hook
* The hook name.
* @param mixed $data
- * Arbitrary data associated to the hook invocation.
+ * Arbitrary data associated with the hook invocation.
*/
function _entity_test_record_hooks($hook, $data) {
$state = \Drupal::state();
diff --git a/core/modules/taxonomy/src/Controller/TaxonomyController.php b/core/modules/taxonomy/src/Controller/TaxonomyController.php
index 2e35678853e0..69f237f953dc 100644
--- a/core/modules/taxonomy/src/Controller/TaxonomyController.php
+++ b/core/modules/taxonomy/src/Controller/TaxonomyController.php
@@ -32,7 +32,7 @@ public function getTitle(TermInterface $term) {
}
/**
- * Returns a rendered edit form to create a new term associated to the given vocabulary.
+ * Returns a form to add a new term to a vocabulary.
*
* @param \Drupal\taxonomy\VocabularyInterface $taxonomy_vocabulary
* The vocabulary this term will be added to.
diff --git a/core/modules/views/src/Entity/Render/EntityTranslationRendererBase.php b/core/modules/views/src/Entity/Render/EntityTranslationRendererBase.php
index 4da6672c1789..39c2c532296c 100644
--- a/core/modules/views/src/Entity/Render/EntityTranslationRendererBase.php
+++ b/core/modules/views/src/Entity/Render/EntityTranslationRendererBase.php
@@ -16,7 +16,7 @@
abstract class EntityTranslationRendererBase extends RendererBase {
/**
- * Returns the language code associated to the given row.
+ * Returns the language code associated with the given row.
*
* @param \Drupal\views\ResultRow $row
* The result row.
diff --git a/core/modules/views/src/Plugin/views/style/Table.php b/core/modules/views/src/Plugin/views/style/Table.php
index 8a594cf0afdb..199383808f91 100644
--- a/core/modules/views/src/Plugin/views/style/Table.php
+++ b/core/modules/views/src/Plugin/views/style/Table.php
@@ -232,7 +232,7 @@ public function buildOptionsForm(&$form, FormStateInterface $form_state) {
$form['caption'] = array(
'#type' => 'textfield',
'#title' => $this->t('Caption for the table'),
- '#description' => $this->t('A title which is semantically associated to your table for increased accessibility.'),
+ '#description' => $this->t('A title semantically associated with your table for increased accessibility.'),
'#default_value' => $this->options['caption'],
'#maxlength' => 255,
);
--
GitLab