From e775d664abadbd06c100840a893ce5eb2408f11c Mon Sep 17 00:00:00 2001
From: Alex Pott <alex.a.pott@googlemail.com>
Date: Mon, 20 Oct 2014 09:30:46 +0100
Subject: [PATCH] Issue #1971208 by calebtr, dsayswhat, metzlerd, agentrickard:
Replace "utilize" with a proper verb.
---
core/CHANGELOG.txt | 2 +-
core/UPGRADE.txt | 2 +-
core/includes/theme.inc | 2 +-
core/lib/Drupal/Component/Annotation/Plugin.php | 4 ++--
core/lib/Drupal/Core/Ajax/SettingsCommand.php | 4 ++--
.../Drupal/Core/Config/Entity/ConfigEntityBase.php | 2 +-
.../Entity/EntityWithPluginCollectionInterface.php | 2 +-
core/modules/node/node.module | 6 +++---
.../node/src/NodeAccessControlHandlerInterface.php | 4 ++--
core/modules/system/core.api.php | 14 +++++++-------
.../system/src/Tests/Database/LoggingTest.php | 2 +-
core/modules/system/theme.api.php | 2 +-
core/modules/user/src/UserViewsData.php | 2 +-
core/modules/views/src/DisplayPluginCollection.php | 2 +-
.../src/Plugin/views/ViewsHandlerInterface.php | 2 +-
.../views/relationship/RelationshipPluginBase.php | 11 ++++++-----
core/modules/views/views.api.php | 4 ++--
core/modules/views_ui/src/Tests/DisplayTest.php | 2 +-
core/modules/views_ui/src/Tests/StyleUITest.php | 2 +-
core/modules/views_ui/src/ViewEditForm.php | 4 ++--
core/themes/seven/js/nav-tabs.js | 2 +-
21 files changed, 39 insertions(+), 38 deletions(-)
diff --git a/core/CHANGELOG.txt b/core/CHANGELOG.txt
index 0fdb64c29c85..83fc76658f9a 100644
--- a/core/CHANGELOG.txt
+++ b/core/CHANGELOG.txt
@@ -132,7 +132,7 @@ Drupal 8.0, xxxx-xx-xx (development version)
Drupal 7.0, 2011-01-05
----------------------
- Database:
- * Fully rewritten database layer utilizing PHP 5's PDO abstraction layer.
+ * Fully rewritten database layer using PHP 5's PDO abstraction layer.
* Drupal now requires MySQL >= 5.0.15 or PostgreSQL >= 8.3.
* Added query builders for INSERT, UPDATE, DELETE, MERGE, and SELECT queries.
* Support for primary/replica replication, transactions, multi-insert
diff --git a/core/UPGRADE.txt b/core/UPGRADE.txt
index 7c700505e2c1..7c43bbca8ce1 100644
--- a/core/UPGRADE.txt
+++ b/core/UPGRADE.txt
@@ -124,7 +124,7 @@ following the instructions in the INTRODUCTION section at the top of this file:
MAJOR VERSION MIGRATION
-----------------------
Upgrading from a prior major version of Drupal to Drupal 8.x is not possible.
-The process now requires a migration to a Drupal 8.x site, utilizing the Migrate
+The process now requires a migration to a Drupal 8.x site, using the Migrate
module in Drupal core.
Note that migration support in Drupal 8 is currently only partially implemented.
diff --git a/core/includes/theme.inc b/core/includes/theme.inc
index 723ae6304088..cc0faa31566a 100644
--- a/core/includes/theme.inc
+++ b/core/includes/theme.inc
@@ -1768,7 +1768,7 @@ function template_preprocess_html(&$variables) {
*
* Default template: page.html.twig.
*
- * Most themes utilize their own copy of page.html.twig. The default is located
+ * Most themes use their own copy of page.html.twig. The default is located
* inside "modules/system/page.html.twig". Look in there for the full list of
* variables.
*
diff --git a/core/lib/Drupal/Component/Annotation/Plugin.php b/core/lib/Drupal/Component/Annotation/Plugin.php
index 044043410d89..8eaa626873ca 100644
--- a/core/lib/Drupal/Component/Annotation/Plugin.php
+++ b/core/lib/Drupal/Component/Annotation/Plugin.php
@@ -12,8 +12,8 @@
/**
* Defines a Plugin annotation object.
*
- * Annotations in plugin classes can utilize this class in order to pass
- * various metadata about the plugin through the parser to
+ * Annotations in plugin classes can use this class in order to pass various
+ * metadata about the plugin through the parser to
* DiscoveryInterface::getDefinitions() calls. This allows the metadata
* of a class to be located with the class itself, rather than in module-based
* info hooks.
diff --git a/core/lib/Drupal/Core/Ajax/SettingsCommand.php b/core/lib/Drupal/Core/Ajax/SettingsCommand.php
index 4f1cbe82447a..a5a8dc847487 100644
--- a/core/lib/Drupal/Core/Ajax/SettingsCommand.php
+++ b/core/lib/Drupal/Core/Ajax/SettingsCommand.php
@@ -26,8 +26,8 @@ class SettingsCommand implements CommandInterface {
/**
* An array of key/value pairs of JavaScript settings.
*
- * This will be utilized for all commands after this if they do not include
- * their own settings array.
+ * This will be used for all commands after this if they do not include their
+ * own settings array.
*
* @var array
*/
diff --git a/core/lib/Drupal/Core/Config/Entity/ConfigEntityBase.php b/core/lib/Drupal/Core/Config/Entity/ConfigEntityBase.php
index d63eda511673..86a52357c8cb 100644
--- a/core/lib/Drupal/Core/Config/Entity/ConfigEntityBase.php
+++ b/core/lib/Drupal/Core/Config/Entity/ConfigEntityBase.php
@@ -43,7 +43,7 @@ abstract class ConfigEntityBase extends Entity implements ConfigEntityInterface
/**
* The name of the property that is used to store plugin configuration.
*
- * This is needed when the entity utilizes a LazyPluginCollection, to dictate
+ * This is needed when the entity uses a LazyPluginCollection, to dictate
* where the plugin configuration should be stored.
*
* @var string
diff --git a/core/lib/Drupal/Core/Entity/EntityWithPluginCollectionInterface.php b/core/lib/Drupal/Core/Entity/EntityWithPluginCollectionInterface.php
index 87bb803b8462..dd92a5acce24 100644
--- a/core/lib/Drupal/Core/Entity/EntityWithPluginCollectionInterface.php
+++ b/core/lib/Drupal/Core/Entity/EntityWithPluginCollectionInterface.php
@@ -8,7 +8,7 @@
namespace Drupal\Core\Entity;
/**
- * Provides an interface for an object utilizing a plugin collection.
+ * Provides an interface for an object using a plugin collection.
*
* @see \Drupal\Component\Plugin\LazyPluginCollection
*
diff --git a/core/modules/node/node.module b/core/modules/node/node.module
index d4e159fa4ebf..11f2092d0871 100644
--- a/core/modules/node/node.module
+++ b/core/modules/node/node.module
@@ -570,9 +570,9 @@ function node_theme_suggestions_node(array $variables) {
*
* Default template: node.html.twig.
*
- * Most themes utilize their own copy of node.html.twig. The default is located
- * inside "/core/modules/node/templates/node.html.twig". Look in there for the full
- * list of variables.
+ * Most themes use their own copy of node.html.twig. The default is located
+ * inside "/core/modules/node/templates/node.html.twig". Look in there for the
+ * full list of variables.
*
* @param array $variables
* An associative array containing:
diff --git a/core/modules/node/src/NodeAccessControlHandlerInterface.php b/core/modules/node/src/NodeAccessControlHandlerInterface.php
index cb395d00a002..23509e518652 100644
--- a/core/modules/node/src/NodeAccessControlHandlerInterface.php
+++ b/core/modules/node/src/NodeAccessControlHandlerInterface.php
@@ -35,8 +35,8 @@ public function acquireGrants(NodeInterface $node);
* Writes a list of grants to the database, deleting any previously saved ones.
*
* If a realm is provided, it will only delete grants from that realm, but it
- * will always delete a grant from the 'all' realm. Modules that utilize
- * node access can use this function when doing mass updates due to widespread
+ * will always delete a grant from the 'all' realm. Modules that use node
+ * access can use this function when doing mass updates due to widespread
* permission changes.
*
* Note: Don't call this function directly from a contributed module. Call
diff --git a/core/modules/system/core.api.php b/core/modules/system/core.api.php
index fcf45e69ac52..84175109b69a 100644
--- a/core/modules/system/core.api.php
+++ b/core/modules/system/core.api.php
@@ -1535,13 +1535,13 @@
* would be an in-memory queue backend which might lose items if it crashes.
* However, such a backend would be able to deal with significantly more writes
* than a reliable queue and for many tasks this is more important. See
- * aggregator_cron() for an example of how to effectively utilize a
- * non-reliable queue. Another example is doing Twitter statistics -- the small
- * possibility of losing a few items is insignificant next to power of the
- * queue being able to keep up with writes. As described in the processing
- * section, regardless of the queue being reliable or not, the processing code
- * should be aware that an item might be handed over for processing more than
- * once (because the processing code might time out before it finishes).
+ * aggregator_cron() for an example of how to effectively use a non-reliable
+ * queue. Another example is doing Twitter statistics -- the small possibility
+ * of losing a few items is insignificant next to power of the queue being able
+ * to keep up with writes. As described in the processing section, regardless
+ * of the queue being reliable or not, the processing code should be aware that
+ * an item might be handed over for processing more than once (because the
+ * processing code might time out before it finishes).
* @}
*/
diff --git a/core/modules/system/src/Tests/Database/LoggingTest.php b/core/modules/system/src/Tests/Database/LoggingTest.php
index c6034ec87621..cf83b011b165 100644
--- a/core/modules/system/src/Tests/Database/LoggingTest.php
+++ b/core/modules/system/src/Tests/Database/LoggingTest.php
@@ -79,7 +79,7 @@ function testEnableTargetLogging() {
}
/**
- * Tests that logs to separate targets utilize the same connection properly.
+ * Tests that logs to separate targets use the same connection properly.
*
* This test is identical to the one above, except that it doesn't create
* a fake target so the query should fall back to running on the default
diff --git a/core/modules/system/theme.api.php b/core/modules/system/theme.api.php
index 87cf94b1d965..e6a3878c9943 100644
--- a/core/modules/system/theme.api.php
+++ b/core/modules/system/theme.api.php
@@ -19,7 +19,7 @@
* information about render arrays and rendering.
*
* @section sec_twig_theme Twig Templating Engine
- * Drupal 8 utilizes the templating engine Twig. Twig offers developers a fast,
+ * Drupal 8 uses the templating engine Twig. Twig offers developers a fast,
* secure, and flexible method for building templates for Drupal 8 sites. Twig
* also offers substantial usability improvements over PHPTemplate, and does
* not require front-end developers to know PHP to build and manipulate Drupal
diff --git a/core/modules/user/src/UserViewsData.php b/core/modules/user/src/UserViewsData.php
index 4e0af27b5a21..8be2982b40e3 100644
--- a/core/modules/user/src/UserViewsData.php
+++ b/core/modules/user/src/UserViewsData.php
@@ -82,7 +82,7 @@ public function getViewsData() {
$data['users_field_data']['name']['help'] = t('The user or author name.');
$data['users_field_data']['name']['field']['id'] = 'user_name';
$data['users_field_data']['name']['filter']['title'] = t('Name (raw)');
- $data['users_field_data']['name']['filter']['help'] = t('The user or author name. This filter does not check if the user exists and allows partial matching. Does not utilize autocomplete.');
+ $data['users_field_data']['name']['filter']['help'] = t('The user or author name. This filter does not check if the user exists and allows partial matching. Does not use autocomplete.');
// Note that this field implements field level access control.
$data['users_field_data']['mail']['help'] = t('Email address for a given user. This field is normally not shown to users, so be cautious when using it.');
diff --git a/core/modules/views/src/DisplayPluginCollection.php b/core/modules/views/src/DisplayPluginCollection.php
index e1c96b543721..0862cff25b04 100644
--- a/core/modules/views/src/DisplayPluginCollection.php
+++ b/core/modules/views/src/DisplayPluginCollection.php
@@ -95,7 +95,7 @@ protected function initializePlugin($display_id) {
$this->pluginInstances[$display_id]->initDisplay($this->view, $display);
// If this is not the default display handler, let it know which is since
- // it may well utilize some data from the default.
+ // it may well use some data from the default.
if ($display_id != 'default') {
$this->pluginInstances[$display_id]->default_display = $this->pluginInstances['default'];
}
diff --git a/core/modules/views/src/Plugin/views/ViewsHandlerInterface.php b/core/modules/views/src/Plugin/views/ViewsHandlerInterface.php
index 4a48372886a0..826b77b11fcf 100644
--- a/core/modules/views/src/Plugin/views/ViewsHandlerInterface.php
+++ b/core/modules/views/src/Plugin/views/ViewsHandlerInterface.php
@@ -103,7 +103,7 @@ public function getField($field = NULL);
*
* This gives all the handlers some time to modify values. This is primarily
* used so that handlers that pull up secondary data can put it in the
- * $values so that the raw data can be utilized externally.
+ * $values so that the raw data can be used externally.
*/
public function postExecute(&$values);
diff --git a/core/modules/views/src/Plugin/views/relationship/RelationshipPluginBase.php b/core/modules/views/src/Plugin/views/relationship/RelationshipPluginBase.php
index 15b3ab0fd675..8a39ae9dc6d0 100644
--- a/core/modules/views/src/Plugin/views/relationship/RelationshipPluginBase.php
+++ b/core/modules/views/src/Plugin/views/relationship/RelationshipPluginBase.php
@@ -32,14 +32,14 @@
* Simple relationship handler that allows a new version of the primary table
* to be linked in.
*
- * The base relationship handler can only handle a single join. Some relationships
- * are more complex and might require chains of joins; for those, you must
- * utilize a custom relationship handler.
+ * The base relationship handler can only handle a single join. Some
+ * relationships are more complex and might require chains of joins; for those,
+ * you must use a custom relationship handler.
*
* Definition items:
* - base: The new base table this relationship will be adding. This does not
* have to be a declared base table, but if there are no tables that
- * utilize this base table, it won't be very effective.
+ * use this base table, it won't be very effective.
* - base field: The field to use in the relationship; if left out this will be
* assumed to be the primary field.
* - relationship table: The actual table this relationship operates against.
@@ -86,7 +86,8 @@ public function usesGroupBy() {
protected function defineOptions() {
$options = parent::defineOptions();
- // Relationships definitions should define a default label, but if they aren't get another default value.
+ // Relationships definitions should define a default label, but if they
+ // aren't get another default value.
if (!empty($this->definition['label'])) {
// Cast the label to a string since it is an object.
// @see \Drupal\Core\StringTranslation\TranslationWrapper
diff --git a/core/modules/views/views.api.php b/core/modules/views/views.api.php
index d5f05294471a..35e99beeb501 100644
--- a/core/modules/views/views.api.php
+++ b/core/modules/views/views.api.php
@@ -720,7 +720,7 @@ function hook_views_post_execute(ViewExecutable $view) {
*
* At this point the query has been executed, and the preRender() phase has
* already happened for handlers, so all data should be available. This hook
- * can be utilized by themes.
+ * can be used by themes.
*
* Output can be added to the view by setting $view->attachment_before
* and $view->attachment_after.
@@ -743,7 +743,7 @@ function hook_views_pre_render(ViewExecutable $view) {
* This can be valuable to be able to cache a view and still have some level of
* dynamic output. In an ideal world, the actual output will include HTML
* comment-based tokens, and then the post process can replace those tokens.
- * This hook can be utilized by themes.
+ * This hook can be used by themes.
*
* Example usage. If it is known that the view is a node view and that the
* primary field will be a nid, you can do something like this:
diff --git a/core/modules/views_ui/src/Tests/DisplayTest.php b/core/modules/views_ui/src/Tests/DisplayTest.php
index f451edf0a91e..9fb9866ad847 100644
--- a/core/modules/views_ui/src/Tests/DisplayTest.php
+++ b/core/modules/views_ui/src/Tests/DisplayTest.php
@@ -125,7 +125,7 @@ public function testDisplayAreas() {
// Assert that the expected text is found in each area category.
foreach ($areas as $type => $class) {
$element = $this->xpath('//div[contains(@class, :class)]/div', array(':class' => $class));
- $this->assertEqual((string) $element[0], String::format('The selected display type does not utilize @type plugins', array('@type' => $type)));
+ $this->assertEqual((string) $element[0], String::format('The selected display type does not use @type plugins', array('@type' => $type)));
}
}
diff --git a/core/modules/views_ui/src/Tests/StyleUITest.php b/core/modules/views_ui/src/Tests/StyleUITest.php
index d38431c0a62a..1dd4d6971796 100644
--- a/core/modules/views_ui/src/Tests/StyleUITest.php
+++ b/core/modules/views_ui/src/Tests/StyleUITest.php
@@ -64,7 +64,7 @@ public function testStyleUI() {
$this->drupalPostForm("admin/structure/views/view/$view_name/edit", array(), 'Add Page');
$this->drupalPostForm("admin/structure/views/nojs/display/$view_name/page_1/row", array('row[type]' => 'fields'), t('Apply'));
// If fields are being used this text will not be shown.
- $this->assertNoText(t('The selected style or row format does not utilize fields.'));
+ $this->assertNoText(t('The selected style or row format does not use fields.'));
}
}
diff --git a/core/modules/views_ui/src/ViewEditForm.php b/core/modules/views_ui/src/ViewEditForm.php
index 57e9753a96e4..8b1e4a291047 100644
--- a/core/modules/views_ui/src/ViewEditForm.php
+++ b/core/modules/views_ui/src/ViewEditForm.php
@@ -966,7 +966,7 @@ public function getFormBucket(ViewUI $view, $type, $display) {
$uses_fields = $style_plugin && $style_plugin->usesFields();
if (!$uses_fields) {
$build['fields'][] = array(
- '#markup' => $this->t('The selected style or row format does not utilize fields.'),
+ '#markup' => $this->t('The selected style or row format does not use fields.'),
'#theme_wrappers' => array('views_ui_container'),
'#attributes' => array('class' => array('views-display-setting')),
);
@@ -978,7 +978,7 @@ public function getFormBucket(ViewUI $view, $type, $display) {
case 'empty':
if (!$executable->display_handler->usesAreas()) {
$build[$type][] = array(
- '#markup' => $this->t('The selected display type does not utilize @type plugins', array('@type' => $type)),
+ '#markup' => $this->t('The selected display type does not use @type plugins', array('@type' => $type)),
'#theme_wrappers' => array('views_ui_container'),
'#attributes' => array('class' => array('views-display-setting')),
);
diff --git a/core/themes/seven/js/nav-tabs.js b/core/themes/seven/js/nav-tabs.js
index 4c838b16c1d4..f0087066a220 100644
--- a/core/themes/seven/js/nav-tabs.js
+++ b/core/themes/seven/js/nav-tabs.js
@@ -1,7 +1,7 @@
/**
* @file
* Responsive navigation tabs.
- * Utilizes jquery.intrinsic.js to calculate if the tabs are larger than their
+ * Uses jquery.intrinsic.js to calculate if the tabs are larger than their
* container and toggles the 'is-horizontal' class.
*
* This also supports collapsible navigable is the 'is-collapsible' class is
--
GitLab