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'] = '' . $module . ' 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 ' . $module . ' module, you will need to install a version of the module with valid updates.'; + $ret[$module]['warning'] = '' . $module . ' 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 ' . $module . ' 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 .= '

' . t('Uses') . '

'; $output .= '
'; $output .= '
' . t('Installing text editors') . '
'; - $output .= '
' . 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 CKEditor5 module, which can be enabled on the Extend page, 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()]) . '
'; + $output .= '
' . 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 CKEditor5 module, which can be installed on the Extend page, 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()]) . '
'; $output .= '
' . t('Enabling a text editor for a text format') . '
'; $output .= '
' . t('On the Text formats and editors page you can see which text editor is associated with each text format. You can change this by clicking on the Configure link, and then choosing a text editor or none from the Text editor 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()]) . '
'; $output .= '
' . t('Configuring a text editor') . '
'; 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 @@ class DbUpdateController extends ControllerBase { $this->keyValueExpirableFactory->get('update_available_release')->deleteAll(); $build['info_header'] = [ - '#markup' => '

' . $this->t('Use this utility to update your database whenever a new release of Drupal or a module is installed.') . '

' . $this->t('For more detailed information, see the Updating Drupal guide. If you are unsure what these terms mean you should probably contact your hosting provider.') . '

', + '#markup' => '

' . $this->t('Use this utility to update your database whenever a module, theme, or the core software is updated.') . '

' . $this->t('For more detailed information, see the upgrading handbook. If you are unsure what these terms mean you should probably contact your hosting provider.') . '

', ]; $info[] = $this->t("Back up your code. 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 @@ class DbUpdateController extends ControllerBase { ':url' => Url::fromRoute('system.site_maintenance_mode')->setOption('base_url', $base_url)->toString(TRUE)->getGeneratedUrl(), ]); $info[] = $this->t('Back up your database. 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 = '

' . t('Add contributed modules to extend your site\'s functionality.', [':modules' => 'https://www.drupal.org/project/modules']) . '

'; if (!\Drupal::moduleHandler()->moduleExists('update')) { - $output .= '

' . t('Regularly review available updates to maintain a secure and current site. Always run the update script each time a module is updated. Enable the Update Manager module 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()]) . '

'; + $output .= '

' . t('Regularly review available updates and update as required to maintain a secure and current site. Always run the update script each time a module is updated. Install the Update Manager module 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()]) . '

'; } 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 available updates 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 available updates 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 available updates 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 '

' . 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.') . '

'; case 'system.modules_list': - if (_update_manager_access()) { - $output = '

' . t('Regularly review and install available updates to maintain a secure and current site. Always run the update script each time a module is updated.', [':update-php' => Url::fromRoute('system.db_update')->toString(), ':updates' => Url::fromRoute('update.status')->toString()]) . '

'; - } - else { - $output = '

' . t('Regularly review available updates to maintain a secure and current site. Always run the update script each time a module is updated.', [':update-php' => Url::fromRoute('system.db_update')->toString(), ':updates' => Url::fromRoute('update.status')->toString()]) . '

'; - } - return $output; + return '

' . t('Regularly review available updates and update as required to maintain a secure and current site. Always run the update script each time you update software.', [':update-php' => Url::fromRoute('system.db_update')->toString(), ':updates' => Url::fromRoute('update.status')->toString()]) . '

'; + } } @@ -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') {