From 17f21792eb57a053792c389d6c41eda8eab16b97 Mon Sep 17 00:00:00 2001
From: Lee Rowlands <lee.rowlands@previousnext.com.au>
Date: Wed, 29 Mar 2023 11:36:22 +1000
Subject: [PATCH] Issue #3182405 by jhodgdon, smustgrave, ranjith_kumar_k_u,
dww: Do not use verb "Install" for things other than turning on
modules/themes
---
core/includes/update.inc | 2 +-
core/modules/editor/editor.module | 2 +-
.../system/src/Controller/DbUpdateController.php | 4 ++--
core/modules/system/system.module | 2 +-
core/modules/update/update.authorize.inc | 2 +-
core/modules/update/update.install | 2 +-
core/modules/update/update.module | 11 +++--------
7 files changed, 10 insertions(+), 15 deletions(-)
diff --git a/core/includes/update.inc b/core/includes/update.inc
index 1e9dd0d68c93..dac375df909f 100644
--- a/core/includes/update.inc
+++ b/core/includes/update.inc
@@ -342,7 +342,7 @@ function update_get_update_list() {
if ($updates) {
foreach ($updates as $update) {
if ($update == \Drupal::CORE_MINIMUM_SCHEMA_VERSION) {
- $ret[$module]['warning'] = '<em>' . $module . '</em> module cannot be updated. It contains an update numbered as ' . \Drupal::CORE_MINIMUM_SCHEMA_VERSION . ' which is reserved for the earliest installation of a module in Drupal ' . \Drupal::CORE_COMPATIBILITY . ', before any updates. In order to update <em>' . $module . '</em> module, you will need to install a version of the module with valid updates.';
+ $ret[$module]['warning'] = '<em>' . $module . '</em> module cannot be updated. It contains an update numbered as ' . \Drupal::CORE_MINIMUM_SCHEMA_VERSION . ' which is reserved for the earliest installation of a module in Drupal ' . \Drupal::CORE_COMPATIBILITY . ', before any updates. In order to update <em>' . $module . '</em> module, you will need to download a version of the module with valid updates.';
continue 2;
}
if ($update > $schema_version) {
diff --git a/core/modules/editor/editor.module b/core/modules/editor/editor.module
index a4d86712fb6c..4698f761a3b6 100644
--- a/core/modules/editor/editor.module
+++ b/core/modules/editor/editor.module
@@ -32,7 +32,7 @@ function editor_help($route_name, RouteMatchInterface $route_match) {
$output .= '<h3>' . t('Uses') . '</h3>';
$output .= '<dl>';
$output .= '<dt>' . t('Installing text editors') . '</dt>';
- $output .= '<dd>' . t('The Text Editor module provides a framework for managing editors. To use it, you also need to enable a text editor. This can either be the core <a href=":ckeditor5">CKEditor5 module</a>, which can be enabled on the <a href=":extend">Extend page</a>, or a contributed module for any other text editor. When installing a contributed text editor module, be sure to check the installation instructions, because you will most likely need to download and install an external library as well as the Drupal module.', [':ckeditor5' => (\Drupal::moduleHandler()->moduleExists('ckeditor5')) ? Url::fromRoute('help.page', ['name' => 'ckeditor5'])->toString() : '#', ':extend' => Url::fromRoute('system.modules_list')->toString()]) . '</dd>';
+ $output .= '<dd>' . t('The Text Editor module provides a framework for managing editors. To use it, you also need to install a text editor. This can either be the core <a href=":ckeditor5">CKEditor5 module</a>, which can be installed on the <a href=":extend">Extend page</a>, or a contributed module for any other text editor. When installing a contributed text editor module, be sure to check the installation instructions, because you will most likely need to download an external library as well as the Drupal module.', [':ckeditor5' => (\Drupal::moduleHandler()->moduleExists('ckeditor5')) ? Url::fromRoute('help.page', ['name' => 'ckeditor5'])->toString() : '#', ':extend' => Url::fromRoute('system.modules_list')->toString()]) . '</dd>';
$output .= '<dt>' . t('Enabling a text editor for a text format') . '</dt>';
$output .= '<dd>' . t('On the <a href=":formats">Text formats and editors page</a> you can see which text editor is associated with each text format. You can change this by clicking on the <em>Configure</em> link, and then choosing a text editor or <em>none</em> from the <em>Text editor</em> drop-down list. The text editor will then be displayed with any text field for which this text format is chosen.', [':formats' => Url::fromRoute('filter.admin_overview')->toString()]) . '</dd>';
$output .= '<dt>' . t('Configuring a text editor') . '</dt>';
diff --git a/core/modules/system/src/Controller/DbUpdateController.php b/core/modules/system/src/Controller/DbUpdateController.php
index de66f43687d5..a7068b29a75a 100644
--- a/core/modules/system/src/Controller/DbUpdateController.php
+++ b/core/modules/system/src/Controller/DbUpdateController.php
@@ -213,7 +213,7 @@ protected function info(Request $request) {
$this->keyValueExpirableFactory->get('update_available_release')->deleteAll();
$build['info_header'] = [
- '#markup' => '<p>' . $this->t('Use this utility to update your database whenever a new release of Drupal or a module is installed.') . '</p><p>' . $this->t('For more detailed information, see the <a href="https://www.drupal.org/docs/updating-drupal">Updating Drupal guide</a>. If you are unsure what these terms mean you should probably contact your hosting provider.') . '</p>',
+ '#markup' => '<p>' . $this->t('Use this utility to update your database whenever a module, theme, or the core software is updated.') . '</p><p>' . $this->t('For more detailed information, see the <a href="https://www.drupal.org/upgrade">upgrading handbook</a>. If you are unsure what these terms mean you should probably contact your hosting provider.') . '</p>',
];
$info[] = $this->t("<strong>Back up your code</strong>. Hint: when backing up module code, do not leave that backup in the 'modules' or 'sites/*/modules' directories as this may confuse Drupal's auto-discovery mechanism.");
@@ -223,7 +223,7 @@ protected function info(Request $request) {
':url' => Url::fromRoute('system.site_maintenance_mode')->setOption('base_url', $base_url)->toString(TRUE)->getGeneratedUrl(),
]);
$info[] = $this->t('<strong>Back up your database</strong>. This process will change your database values and in case of emergency you may need to revert to a backup.');
- $info[] = $this->t('Install your new files in the appropriate location, as described in the handbook.');
+ $info[] = $this->t('Update your files (as described in the handbook page linked above).');
$build['info'] = [
'#theme' => 'item_list',
'#list_type' => 'ol',
diff --git a/core/modules/system/system.module b/core/modules/system/system.module
index 2138bde59756..5372aa4322fd 100644
--- a/core/modules/system/system.module
+++ b/core/modules/system/system.module
@@ -125,7 +125,7 @@ function system_help($route_name, RouteMatchInterface $route_match) {
case 'system.modules_list':
$output = '<p>' . t('Add <a href=":modules">contributed modules</a> to extend your site\'s functionality.', [':modules' => 'https://www.drupal.org/project/modules']) . '</p>';
if (!\Drupal::moduleHandler()->moduleExists('update')) {
- $output .= '<p>' . t('Regularly review available updates to maintain a secure and current site. Always run the <a href=":update-php">update script</a> each time a module is updated. Enable the <a href=":update-manager">Update Manager module</a> to update and install modules and themes.', [':update-php' => Url::fromRoute('system.db_update')->toString(), ':update-manager' => Url::fromRoute('system.modules_list', [], ['fragment' => 'module-update'])->toString()]) . '</p>';
+ $output .= '<p>' . t('Regularly review available updates and update as required to maintain a secure and current site. Always run the <a href=":update-php">update script</a> each time a module is updated. Install the <a href=":update-manager">Update Manager module</a> to update and add modules and themes.', [':update-php' => Url::fromRoute('system.db_update')->toString(), ':update-manager' => Url::fromRoute('system.modules_list', [], ['fragment' => 'module-update'])->toString()]) . '</p>';
}
return $output;
diff --git a/core/modules/update/update.authorize.inc b/core/modules/update/update.authorize.inc
index 88fe7f95f6c9..742a3f159e16 100644
--- a/core/modules/update/update.authorize.inc
+++ b/core/modules/update/update.authorize.inc
@@ -56,7 +56,7 @@ function update_authorize_run_update($filetransfer, $projects) {
// Since authorize.php has its own method for setting the page title, set it
// manually here rather than passing it in to batch_set() as would normally
// be done.
- \Drupal::request()->getSession()->set('authorize_page_title', t('Installing updates'));
+ \Drupal::request()->getSession()->set('authorize_page_title', t('Downloading updates'));
// Invoke the batch via authorize.php.
return system_authorized_batch_process();
diff --git a/core/modules/update/update.install b/core/modules/update/update.install
index f3b9e64f1a64..b77654d62248 100644
--- a/core/modules/update/update.install
+++ b/core/modules/update/update.install
@@ -126,7 +126,7 @@ function _update_requirement_check($project, $type) {
$requirement['description'][] = ['#markup' => _update_message_text($type, $status)];
if (!in_array($status, [UpdateFetcherInterface::UNKNOWN, UpdateFetcherInterface::NOT_CHECKED, UpdateFetcherInterface::NOT_FETCHED, UpdateFetcherInterface::FETCH_PENDING])) {
if (_update_manager_access()) {
- $requirement['description'][] = ['#prefix' => ' ', '#markup' => t('See the <a href=":available_updates">available updates</a> page for more information and to install your missing updates.', [':available_updates' => Url::fromRoute('update.report_update')->toString()])];
+ $requirement['description'][] = ['#prefix' => ' ', '#markup' => t('See the <a href=":available_updates">available updates</a> page for more information and to update your software.', [':available_updates' => Url::fromRoute('update.report_update')->toString()])];
}
else {
$requirement['description'][] = ['#prefix' => ' ', '#markup' => t('See the <a href=":available_updates">available updates</a> page for more information.', [':available_updates' => Url::fromRoute('update.status')->toString()])];
diff --git a/core/modules/update/update.module b/core/modules/update/update.module
index 4e24834e43ee..ef6abc252312 100644
--- a/core/modules/update/update.module
+++ b/core/modules/update/update.module
@@ -50,13 +50,8 @@ function update_help($route_name, RouteMatchInterface $route_match) {
return '<p>' . t('Here you can find information about available updates for your installed modules and themes. Note that each module or theme is part of a "project", which may or may not have the same name, and might include multiple modules or themes within it.') . '</p>';
case 'system.modules_list':
- if (_update_manager_access()) {
- $output = '<p>' . t('Regularly review and install <a href=":updates">available updates</a> to maintain a secure and current site. Always run the <a href=":update-php">update script</a> each time a module is updated.', [':update-php' => Url::fromRoute('system.db_update')->toString(), ':updates' => Url::fromRoute('update.status')->toString()]) . '</p>';
- }
- else {
- $output = '<p>' . t('Regularly review <a href=":updates">available updates</a> to maintain a secure and current site. Always run the <a href=":update-php">update script</a> each time a module is updated.', [':update-php' => Url::fromRoute('system.db_update')->toString(), ':updates' => Url::fromRoute('update.status')->toString()]) . '</p>';
- }
- return $output;
+ return '<p>' . t('Regularly review <a href=":updates">available updates</a> and update as required to maintain a secure and current site. Always run the <a href=":update-php">update script</a> each time you update software.', [':update-php' => Url::fromRoute('system.db_update')->toString(), ':updates' => Url::fromRoute('update.status')->toString()]) . '</p>';
+
}
}
@@ -403,7 +398,7 @@ function update_mail($key, &$message, $params) {
}
$message['body'][] = t('See the available updates page for more information:', [], ['langcode' => $langcode]) . "\n" . Url::fromRoute('update.status', [], ['absolute' => TRUE, 'language' => $language])->toString();
if (_update_manager_access()) {
- $message['body'][] = t('You can automatically install your missing updates using the Update manager:', [], ['langcode' => $langcode]) . "\n" . Url::fromRoute('update.report_update', [], ['absolute' => TRUE, 'language' => $language])->toString();
+ $message['body'][] = t('You can automatically download your missing updates using the Update manager:', [], ['langcode' => $langcode]) . "\n" . Url::fromRoute('update.report_update', [], ['absolute' => TRUE, 'language' => $language])->toString();
}
$settings_url = Url::fromRoute('update.settings', [], ['absolute' => TRUE])->toString();
if (\Drupal::config('update.settings')->get('notification.threshold') == 'all') {
--
GitLab