diff --git a/core/lib/Drupal/Core/Updater/Module.php b/core/lib/Drupal/Core/Updater/Module.php index d43ad7ea55c85fa76e03363ea79f44241fcabaf9..0ca78b550d2f697897fcc8b4b1d6fcb352542cd5 100644 --- a/core/lib/Drupal/Core/Updater/Module.php +++ b/core/lib/Drupal/Core/Updater/Module.php @@ -130,7 +130,7 @@ public function postInstallTasks() { ], $default_options + [ '#url' => Url::fromRoute('system.modules_list'), - '#title' => t('Enable newly added modules'), + '#title' => t('Install newly added modules'), ], $default_options + [ '#url' => Url::fromRoute('system.admin'), diff --git a/core/modules/forum/tests/src/Functional/ForumUninstallTest.php b/core/modules/forum/tests/src/Functional/ForumUninstallTest.php index da4af49eaba59d8e068e721d37bb0a8dd8dfb052..3c127b3627c57c47eaf0925ccdf1b90316602223 100644 --- a/core/modules/forum/tests/src/Functional/ForumUninstallTest.php +++ b/core/modules/forum/tests/src/Functional/ForumUninstallTest.php @@ -132,7 +132,7 @@ public function testForumUninstallWithField() { // Double check everything by reinstalling the forum module again. $this->drupalGet('admin/modules'); $this->submitForm(['modules[forum][enable]' => 1], 'Install'); - $this->assertSession()->pageTextContains('Module Forum has been enabled.'); + $this->assertSession()->pageTextContains('Module Forum has been installed.'); } /** diff --git a/core/modules/image/image.install b/core/modules/image/image.install index bd692bd70c1896acbc42746b9da7e898c124d0b9..d715309587679e4d4290afe4022bb2575bcea060 100644 --- a/core/modules/image/image.install +++ b/core/modules/image/image.install @@ -61,7 +61,7 @@ function image_requirements($phase) { 'image.toolkit' => [ 'title' => t('Image toolkit'), 'value' => t('None'), - 'description' => t("No image toolkit is configured on the site. Check PHP installed extensions or add a contributed toolkit that doesn't require a PHP extension. Make sure that at least one valid image toolkit is enabled."), + 'description' => t("No image toolkit is configured on the site. Check PHP installed extensions or add a contributed toolkit that doesn't require a PHP extension. Make sure that at least one valid image toolkit is installed."), 'severity' => REQUIREMENT_ERROR, ], ]; diff --git a/core/modules/locale/tests/src/Functional/LocaleConfigTranslationImportTest.php b/core/modules/locale/tests/src/Functional/LocaleConfigTranslationImportTest.php index 2689dc69ef76cdbf73c165c7f1565a6a56b80df9..4b6421a57a105fe58484980cd89ef068126116a0 100644 --- a/core/modules/locale/tests/src/Functional/LocaleConfigTranslationImportTest.php +++ b/core/modules/locale/tests/src/Functional/LocaleConfigTranslationImportTest.php @@ -176,7 +176,7 @@ public function testConfigTranslationModuleInstall() { // Install any module. $this->drupalGet('admin/modules'); $this->submitForm(['modules[dblog][enable]' => 'dblog'], 'Install'); - $this->assertSession()->pageTextContains('Module Database Logging has been enabled.'); + $this->assertSession()->pageTextContains('Module Database Logging has been installed.'); // Get the front page and ensure that the translated configuration still // appears. diff --git a/core/modules/media/tests/src/Functional/MediaInstallTest.php b/core/modules/media/tests/src/Functional/MediaInstallTest.php index 4fef68fe7874a87d39e63189c1f434acfca33b9d..5fa3658ca45549bf30679d3ee591760d368c7059 100644 --- a/core/modules/media/tests/src/Functional/MediaInstallTest.php +++ b/core/modules/media/tests/src/Functional/MediaInstallTest.php @@ -43,7 +43,7 @@ public function testReinstallAfterUninstall() { $page->checkField('modules[media][enable]'); $page->pressButton('Install'); $assert_session->pageTextNotContains('could not be moved/copied because a file by that name already exists in the destination directory'); - $assert_session->pageTextContains('Module Media has been enabled'); + $assert_session->pageTextContains('Module Media has been installed'); } } diff --git a/core/modules/migrate_drupal_ui/src/Form/OverviewForm.php b/core/modules/migrate_drupal_ui/src/Form/OverviewForm.php index e9c29e30692cec744010bde562d0d5ac71dee87f..aa3a5ecc36ee93757fb2acd8523532cd247b7128 100644 --- a/core/modules/migrate_drupal_ui/src/Form/OverviewForm.php +++ b/core/modules/migrate_drupal_ui/src/Form/OverviewForm.php @@ -51,7 +51,7 @@ public function buildForm(array $form, FormStateInterface $form_state) { $info[] = $this->t('Make sure that <strong>access to the database</strong> for the old site is available from this new site.'); $info[] = $this->t('<strong>If the old site has private files</strong>, a copy of its files directory must also be accessible on the host of this new site.'); - $info[] = $this->t('<strong>Enable all modules on this new site</strong> that are enabled on the old site. For example, if the old site uses the Book module, then enable the Book module on this new site so that the existing data can be imported to it.'); + $info[] = $this->t('<strong>Install all modules on this new site</strong> that are enabled on the old site. For example, if the old site uses the Book module, then install the Book module on this new site so that the existing data can be imported to it.'); $info[] = $this->t('<strong>Do not add any content to the new site</strong> before upgrading. Any existing content is likely to be overwritten by the upgrade process. See <a href=":url">the upgrade preparation guide</a>.', [ ':url' => 'https://www.drupal.org/docs/8/upgrade/preparing-an-upgrade#do_not_create_content', ]); diff --git a/core/modules/system/src/Form/ModulesEnabledTrait.php b/core/modules/system/src/Form/ModulesEnabledTrait.php index 469ecdd957c225f7ad5811f1513da49162c2ae0c..d7d17ee1d3ae8a9e961b6ea1d2cba422d182953b 100644 --- a/core/modules/system/src/Form/ModulesEnabledTrait.php +++ b/core/modules/system/src/Form/ModulesEnabledTrait.php @@ -44,16 +44,16 @@ protected function modulesEnabledConfirmationMessage(array $modules): PluralTran if ($url->access($this->currentUser())) { return $this->formatPlural( count($modules), - 'Module %name has been enabled. Configure <a href=":link">related permissions</a>.', - '@count modules have been enabled: %names. Configure <a href=":link">related permissions</a>.', + 'Module %name has been installed. Configure <a href=":link">related permissions</a>.', + '@count modules have been installed: %names. Configure <a href=":link">related permissions</a>.', $t_args + [':link' => $url->toString()] ); } return $this->formatPlural( count($modules), - 'Module %name has been enabled.', - '@count modules have been enabled: %names.', + 'Module %name has been installed.', + '@count modules have been installed: %names.', $t_args ); } diff --git a/core/modules/system/src/Form/ModulesListConfirmForm.php b/core/modules/system/src/Form/ModulesListConfirmForm.php index cdc831037a533604018d9f98966fede96eaeed6d..a6e5c3e3e82e08f7ddae721eca830978ff797c3c 100644 --- a/core/modules/system/src/Form/ModulesListConfirmForm.php +++ b/core/modules/system/src/Form/ModulesListConfirmForm.php @@ -80,7 +80,7 @@ public static function create(ContainerInterface $container) { * {@inheritdoc} */ public function getQuestion() { - return $this->t('Some required modules must be enabled'); + return $this->t('Some required modules must be installed'); } /** @@ -146,7 +146,7 @@ protected function buildMessageList() { // Display a list of required modules that have to be installed as well // but were not manually selected. foreach ($this->modules['dependencies'] as $module => $dependencies) { - $items[] = $this->formatPlural(count($dependencies), 'You must enable the @required module to install @module.', 'You must enable the @required modules to install @module.', [ + $items[] = $this->formatPlural(count($dependencies), 'You must install the @required module to install @module.', 'You must install the @required modules to install @module.', [ '@module' => $this->modules['install'][$module], // It is safe to implode this because module names are not translated // markup and so will not be double-escaped. diff --git a/core/modules/system/src/Form/ModulesListNonStableConfirmForm.php b/core/modules/system/src/Form/ModulesListNonStableConfirmForm.php index 93bc6b5406ea4fd3dfecfd3045813b2cdf332ee1..9c0f649ac58daa88422c3f8823b3bfd1fe6575b8 100644 --- a/core/modules/system/src/Form/ModulesListNonStableConfirmForm.php +++ b/core/modules/system/src/Form/ModulesListNonStableConfirmForm.php @@ -84,22 +84,22 @@ public function getQuestion() { $hasDeprecatedModulesToEnable = !empty($this->groupedModuleInfo[ExtensionLifecycle::DEPRECATED]); if ($hasExperimentalModulesToEnable && $hasDeprecatedModulesToEnable) { - return $this->t('Are you sure you wish to enable experimental and deprecated modules?'); + return $this->t('Are you sure you wish to install experimental and deprecated modules?'); } if ($hasExperimentalModulesToEnable) { return $this->formatPlural( count($this->groupedModuleInfo[ExtensionLifecycle::EXPERIMENTAL]), - 'Are you sure you wish to enable an experimental module?', - 'Are you sure you wish to enable experimental modules?' + 'Are you sure you wish to install an experimental module?', + 'Are you sure you wish to install experimental modules?' ); } if ($hasDeprecatedModulesToEnable) { return $this->formatPlural( count($this->groupedModuleInfo[ExtensionLifecycle::DEPRECATED]), - 'Are you sure you wish to enable a deprecated module?', - 'Are you sure you wish to enable deprecated modules?' + 'Are you sure you wish to install a deprecated module?', + 'Are you sure you wish to install deprecated modules?' ); } } diff --git a/core/modules/system/src/Form/ThemeExperimentalConfirmForm.php b/core/modules/system/src/Form/ThemeExperimentalConfirmForm.php index 5fc4de2e56f50389c24b8ed5725be8262d1400ea..ed3c71e6ccd12248d5deb97c63a3a1e43a4f8855 100644 --- a/core/modules/system/src/Form/ThemeExperimentalConfirmForm.php +++ b/core/modules/system/src/Form/ThemeExperimentalConfirmForm.php @@ -113,7 +113,7 @@ public function buildForm(array $form, FormStateInterface $form_state) { $items = []; if (!empty($dependencies)) { // Display a list of required themes that have to be installed as well. - $items[] = $this->formatPlural(count($dependencies), 'You must enable the @required theme to install @theme.', 'You must enable the @required themes to install @theme.', [ + $items[] = $this->formatPlural(count($dependencies), 'You must install the @required theme to install @theme.', 'You must install the @required themes to install @theme.', [ '@theme' => $get_label($theme), // It is safe to implode this because theme names are not translated // markup and so will not be double-escaped. diff --git a/core/modules/system/system.install b/core/modules/system/system.install index 118125e60f9cfe4cacff515a6c1fd501eb954735..a7d7478614b0d9d661b53cb9522b78a64351533f 100644 --- a/core/modules/system/system.install +++ b/core/modules/system/system.install @@ -122,7 +122,7 @@ function system_requirements($phase) { // Warn if any experimental modules are installed. if (!empty($experimental_modules)) { $requirements['experimental_modules'] = [ - 'title' => t('Experimental modules enabled'), + 'title' => t('Experimental modules installed'), 'value' => t('Experimental modules found: %module_list. <a href=":url">Experimental modules</a> are provided for testing purposes only. Use at your own risk.', ['%module_list' => implode(', ', $experimental_modules), ':url' => 'https://www.drupal.org/core/experimental']), 'severity' => REQUIREMENT_WARNING, ]; @@ -133,7 +133,7 @@ function system_requirements($phase) { $deprecated_modules_link_list[] = (string) Link::fromTextAndUrl($deprecated_module['name'], Url::fromUri($deprecated_module['lifecycle_link']))->toString(); } $requirements['deprecated_modules'] = [ - 'title' => t('Deprecated modules enabled'), + 'title' => t('Deprecated modules installed'), 'value' => t('Deprecated modules found: %module_list.', [ '%module_list' => Markup::create(implode(', ', $deprecated_modules_link_list)), ]), @@ -141,7 +141,7 @@ function system_requirements($phase) { ]; } - // Gather all obsolete and experimental themes being enabled. + // Gather all obsolete and experimental themes being installed. $experimental_themes = []; $deprecated_themes = []; $installed_themes = \Drupal::service('theme_handler')->listInfo(); @@ -168,23 +168,23 @@ function system_requirements($phase) { } } - // Warn if any experimental themes are enabled. + // Warn if any experimental themes are installed. if (!empty($experimental_themes)) { $requirements['experimental_themes'] = [ - 'title' => t('Experimental themes enabled'), + 'title' => t('Experimental themes installed'), 'value' => t('Experimental themes found: %theme_list. Experimental themes are provided for testing purposes only. Use at your own risk.', ['%theme_list' => implode(', ', $experimental_themes)]), 'severity' => REQUIREMENT_WARNING, ]; } - // Warn if any deprecated themes are enabled. + // Warn if any deprecated themes are installed. if (!empty($deprecated_themes)) { foreach ($deprecated_themes as $deprecated_theme) { $deprecated_themes_link_list[] = (string) Link::fromTextAndUrl($deprecated_theme['name'], Url::fromUri($deprecated_theme['lifecycle_link']))->toString(); } $requirements['deprecated_themes'] = [ - 'title' => t('Deprecated themes enabled'), + 'title' => t('Deprecated themes installed'), 'value' => t('Deprecated themes found: %theme_list.', [ '%theme_list' => Markup::create(implode(', ', $deprecated_themes_link_list)), ]), @@ -192,13 +192,13 @@ function system_requirements($phase) { ]; } - // Warn if any obsolete extensions (themes or modules) are enabled. + // Warn if any obsolete extensions (themes or modules) are installed. if (!empty($obsolete_extensions)) { foreach ($obsolete_extensions as $obsolete_extension) { $obsolete_extensions_link_list[] = (string) Link::fromTextAndUrl($obsolete_extension['name'], Url::fromUri($obsolete_extension['lifecycle_link']))->toString(); } $requirements['obsolete_extensions'] = [ - 'title' => t('Obsolete extensions enabled'), + 'title' => t('Obsolete extensions installed'), 'value' => t('Obsolete extensions found: %extensions. Obsolete extensions are provided only so that they can be uninstalled cleanly. You should immediately <a href=":uninstall_url">uninstall these extensions</a> since they may be removed in a future release.', [ '%extensions' => Markup::create(implode(', ', $obsolete_extensions_link_list)), ':uninstall_url' => Url::fromRoute('system.modules_uninstall')->toString(), @@ -1379,7 +1379,7 @@ function system_requirements($phase) { } // When the database driver is provided by a module, then check that the - // providing module is enabled. + // providing module is installed. if ($phase === 'runtime' || $phase === 'update') { $connection = Database::getConnection(); $provider = $connection->getProvider(); @@ -1390,11 +1390,11 @@ function system_requirements($phase) { $pending_updates = $post_update_registry->getPendingUpdateInformation(); if (!in_array('enable_provider_database_driver', array_keys($pending_updates['system']['pending'] ?? []), TRUE)) { // Only show the warning when the post update function has run and - // the module that is providing the database driver is not enabled. + // the module that is providing the database driver is not installed. $requirements['database_driver_provided_by_module'] = [ 'title' => t('Database driver provided by module'), - 'value' => t('Not enabled'), - 'description' => t('The current database driver is provided by the module: %module. The module is currently not enabled. You should immediately <a href=":enable">enable</a> the module.', ['%module' => $provider, ':enable' => Url::fromRoute('system.modules_list')->toString()]), + 'value' => t('Not installed'), + 'description' => t('The current database driver is provided by the module: %module. The module is currently not installed. You should immediately <a href=":install">install</a> the module.', ['%module' => $provider, ':install' => Url::fromRoute('system.modules_list')->toString()]), 'severity' => REQUIREMENT_ERROR, ]; } diff --git a/core/modules/system/system.routing.yml b/core/modules/system/system.routing.yml index 5a7c75e495f69db47e647e4fe78e2d5f81bb4289..dee60fb189cb0fb99e6eb56a36f72d0c0f6f66cf 100644 --- a/core/modules/system/system.routing.yml +++ b/core/modules/system/system.routing.yml @@ -288,7 +288,7 @@ system.modules_list_confirm: path: '/admin/modules/list/confirm' defaults: _form: '\Drupal\system\Form\ModulesListConfirmForm' - _title: 'Some required modules must be enabled' + _title: 'Some required modules must be installed' requirements: _permission: 'administer modules' diff --git a/core/modules/system/tests/src/Functional/Bootstrap/DrupalMessengerServiceTest.php b/core/modules/system/tests/src/Functional/Bootstrap/DrupalMessengerServiceTest.php index 0671fdf0c4b10aca1801ed1c5f29d223b73be9d3..320912f6a90265c2969c7827807e9b6ef1138b64 100644 --- a/core/modules/system/tests/src/Functional/Bootstrap/DrupalMessengerServiceTest.php +++ b/core/modules/system/tests/src/Functional/Bootstrap/DrupalMessengerServiceTest.php @@ -58,7 +58,7 @@ public function testDrupalMessengerService() { $edit["modules[help][enable]"] = TRUE; $this->drupalGet('admin/modules'); $this->submitForm($edit, 'Install'); - $assert->pageTextContains('Help has been enabled'); + $assert->pageTextContains('Help has been installed'); $assert->pageTextContains('system_test_preinstall_module called'); } diff --git a/core/modules/system/tests/src/Functional/Form/ModulesListFormWebTest.php b/core/modules/system/tests/src/Functional/Form/ModulesListFormWebTest.php index 7b14bff990cf01d3cdae0279e40b55f7bc0ecea3..a89af4d8229d90cc0321af8b0b081c606814bef0 100644 --- a/core/modules/system/tests/src/Functional/Form/ModulesListFormWebTest.php +++ b/core/modules/system/tests/src/Functional/Form/ModulesListFormWebTest.php @@ -72,20 +72,20 @@ public function testModulesListFormStatusMessage() { // Enable a module that does not define permissions. $edit = ['modules[layout_discovery][enable]' => 'layout_discovery']; $this->submitForm($edit, 'Install'); - $this->assertSession()->elementTextContains('xpath', "//div[@role='contentinfo' and h2[text()='Status message']]", 'Module Layout Discovery has been enabled.'); + $this->assertSession()->elementTextContains('xpath', "//div[@role='contentinfo' and h2[text()='Status message']]", 'Module Layout Discovery has been installed.'); $this->assertSession()->elementNotExists('xpath', "//div[@role='contentinfo' and h2[text()='Status message']]//a"); // Enable a module that defines permissions. $edit = ['modules[action][enable]' => 'action']; $this->submitForm($edit, 'Install'); - $this->assertSession()->elementTextContains('xpath', "//div[@role='contentinfo' and h2[text()='Status message']]", 'Module Actions UI has been enabled.'); + $this->assertSession()->elementTextContains('xpath', "//div[@role='contentinfo' and h2[text()='Status message']]", 'Module Actions UI has been installed.'); $this->assertSession()->elementExists('xpath', "//div[@role='contentinfo' and h2[text()='Status message']]//a[contains(@href, '/admin/people/permissions/module/action')]"); // Enable a module that has dependencies and both define permissions. $edit = ['modules[content_moderation][enable]' => 'content_moderation']; $this->submitForm($edit, 'Install'); $this->submitForm([], 'Continue'); - $this->assertSession()->elementTextContains('xpath', "//div[@role='contentinfo' and h2[text()='Status message']]", '2 modules have been enabled: Content Moderation, Workflows.'); + $this->assertSession()->elementTextContains('xpath', "//div[@role='contentinfo' and h2[text()='Status message']]", '2 modules have been installed: Content Moderation, Workflows.'); $this->assertSession()->elementExists('xpath', "//div[@role='contentinfo' and h2[text()='Status message']]//a[contains(@href, '/admin/people/permissions/module/content_moderation%2Cworkflows')]"); } @@ -182,7 +182,7 @@ public function testInstalledIncompatibleModule() { $edit = ['modules[changing_module][enable]' => 'changing_module']; $this->drupalGet('admin/modules'); $this->submitForm($edit, 'Install'); - $this->assertSession()->pageTextContains('Module Module that changes has been enabled.'); + $this->assertSession()->pageTextContains('Module Module that changes has been installed.'); file_put_contents($file_path, Yaml::encode($incompatible_info)); $this->drupalGet('admin/modules'); diff --git a/core/modules/system/tests/src/Functional/Module/DependencyTest.php b/core/modules/system/tests/src/Functional/Module/DependencyTest.php index aa0cd9bdf840203552618287cff8929198ec37a3..157af73c523fa04c2ce24b15c5c50f92b5b0423d 100644 --- a/core/modules/system/tests/src/Functional/Module/DependencyTest.php +++ b/core/modules/system/tests/src/Functional/Module/DependencyTest.php @@ -45,7 +45,7 @@ public function testEnableWithoutDependency() { $edit['modules[content_translation][enable]'] = 'content_translation'; $this->drupalGet('admin/modules'); $this->submitForm($edit, 'Install'); - $this->assertSession()->pageTextContains('Some required modules must be enabled'); + $this->assertSession()->pageTextContains('Some required modules must be installed'); $this->assertModules(['content_translation', 'language'], FALSE); @@ -53,7 +53,7 @@ public function testEnableWithoutDependency() { $this->assertNoModuleConfig('language'); $this->submitForm([], 'Continue'); - $this->assertSession()->pageTextContains('2 modules have been enabled: Content Translation, Language.'); + $this->assertSession()->pageTextContains('2 modules have been installed: Content Translation, Language.'); $this->assertModules(['content_translation', 'language'], TRUE); // Assert that the language YAML files were created. @@ -151,7 +151,7 @@ public function testNoVersionInfo() { $edit['modules[system_no_module_version_dependency_test][enable]'] = 'system_no_module_version_dependency_test'; $this->drupalGet('admin/modules'); $this->submitForm($edit, 'Install'); - $this->assertSession()->pageTextContains('2 modules have been enabled: System no module version dependency test, System no module version test.'); + $this->assertSession()->pageTextContains('2 modules have been installed: System no module version dependency test, System no module version test.'); // Ensure status report is working. $this->drupalLogin($this->createUser(['administer site configuration'])); @@ -257,7 +257,7 @@ public function testModuleEnableOrder() { $this->assertModules(['dblog'], FALSE); // Note that dependencies are sorted alphabetically in the confirmation // message. - $this->assertSession()->pageTextContains('You must enable the Configuration Manager, Help modules to install Database Logging.'); + $this->assertSession()->pageTextContains('You must install the Configuration Manager, Help modules to install Database Logging.'); $edit['modules[config][enable]'] = 'config'; $edit['modules[help][enable]'] = 'help'; diff --git a/core/modules/system/tests/src/Functional/Module/NonStableModulesTest.php b/core/modules/system/tests/src/Functional/Module/NonStableModulesTest.php index 239a196eb866ccf419154b470e878fb6e5467327..6b0bde73e7f6af9e3e02417cc86d59571823bc23 100644 --- a/core/modules/system/tests/src/Functional/Module/NonStableModulesTest.php +++ b/core/modules/system/tests/src/Functional/Module/NonStableModulesTest.php @@ -47,12 +47,12 @@ public function testExperimentalConfirmForm(): void { $edit["modules[test_page_test][enable]"] = TRUE; $this->drupalGet('admin/modules'); $this->submitForm($edit, 'Install'); - $this->assertSession()->pageTextContains('Module Test page has been enabled.'); + $this->assertSession()->pageTextContains('Module Test page has been installed.'); $this->assertSession()->pageTextNotContains('Experimental modules are provided for testing purposes only.'); // There should be no warning about enabling experimental or deprecated // modules, since there's no confirmation form. - $this->assertSession()->pageTextNotContains('Are you sure you wish to enable '); + $this->assertSession()->pageTextNotContains('Are you sure you wish to install '); // Uninstall the module. \Drupal::service('module_installer')->uninstall(['test_page_test']); @@ -67,22 +67,22 @@ public function testExperimentalConfirmForm(): void { // The module should not be enabled and there should be a warning and a // list of the experimental modules with only this one. - $this->assertSession()->pageTextNotContains('Experimental Test has been enabled.'); + $this->assertSession()->pageTextNotContains('Experimental Test has been installed.'); $this->assertSession()->pageTextContains('Experimental modules are provided for testing purposes only.'); $this->assertSession()->pageTextContains('The following module is experimental: Experimental Test'); // There should be a warning about enabling experimental modules, but no // warnings about deprecated modules. - $this->assertSession()->pageTextContains('Are you sure you wish to enable an experimental module?'); - $this->assertSession()->pageTextNotContains('Are you sure you wish to enable a deprecated module?'); - $this->assertSession()->pageTextNotContains('Are you sure you wish to enable experimental and deprecated modules?'); + $this->assertSession()->pageTextContains('Are you sure you wish to install an experimental module?'); + $this->assertSession()->pageTextNotContains('Are you sure you wish to install a deprecated module?'); + $this->assertSession()->pageTextNotContains('Are you sure you wish to install experimental and deprecated modules?'); // There should be no message about enabling dependencies. - $this->assertSession()->pageTextNotContains('You must enable'); + $this->assertSession()->pageTextNotContains('You must install'); // Enable the module and confirm that it worked. $this->submitForm([], 'Continue'); - $this->assertSession()->pageTextContains('Experimental Test has been enabled.'); + $this->assertSession()->pageTextContains('Experimental Test has been installed.'); // Uninstall the module. \Drupal::service('module_installer')->uninstall(['experimental_module_test']); @@ -96,26 +96,26 @@ public function testExperimentalConfirmForm(): void { // The module should not be enabled and there should be a warning and a // list of the experimental modules with only this one. - $this->assertSession()->pageTextNotContains('2 modules have been enabled: Experimental Dependency Test, Experimental Test'); + $this->assertSession()->pageTextNotContains('2 modules have been installed: Experimental Dependency Test, Experimental Test'); $this->assertSession()->pageTextContains('Experimental modules are provided for testing purposes only.'); $this->assertSession()->pageTextContains('The following module is experimental: Experimental Test'); // There should be a warning about enabling experimental modules, but no // warnings about deprecated modules. - $this->assertSession()->pageTextContains('Are you sure you wish to enable an experimental module?'); - $this->assertSession()->pageTextNotContains('Are you sure you wish to enable a deprecated module?'); - $this->assertSession()->pageTextNotContains('Are you sure you wish to enable experimental and deprecated modules?'); + $this->assertSession()->pageTextContains('Are you sure you wish to install an experimental module?'); + $this->assertSession()->pageTextNotContains('Are you sure you wish to install a deprecated module?'); + $this->assertSession()->pageTextNotContains('Are you sure you wish to install experimental and deprecated modules?'); // Ensure the non-experimental module is not listed as experimental. $this->assertSession()->pageTextNotContains('The following modules are experimental: Experimental Test, Experimental Dependency Test'); $this->assertSession()->pageTextNotContains('The following module is experimental: Experimental Dependency Test'); // There should be a message about enabling dependencies. - $this->assertSession()->pageTextContains('You must enable the Experimental Test module to install Experimental Dependency Test'); + $this->assertSession()->pageTextContains('You must install the Experimental Test module to install Experimental Dependency Test'); // Enable the module and confirm that it worked. $this->submitForm([], 'Continue'); - $this->assertSession()->pageTextContains('2 modules have been enabled: Experimental Dependency Test, Experimental Test'); + $this->assertSession()->pageTextContains('2 modules have been installed: Experimental Dependency Test, Experimental Test'); // Uninstall the modules. \Drupal::service('module_installer')->uninstall([ @@ -134,26 +134,26 @@ public function testExperimentalConfirmForm(): void { // The module should not be enabled and there should be a warning and a // list of the experimental modules with only this one. - $this->assertSession()->pageTextNotContains('2 modules have been enabled: Experimental Dependency Test, Experimental Test'); + $this->assertSession()->pageTextNotContains('2 modules have been installed: Experimental Dependency Test, Experimental Test'); $this->assertSession()->pageTextContains('Experimental modules are provided for testing purposes only.'); $this->assertSession()->pageTextContains('The following module is experimental: Experimental Test'); // There should be a warning about enabling experimental modules, but no // warnings about deprecated modules. - $this->assertSession()->pageTextContains('Are you sure you wish to enable an experimental module?'); - $this->assertSession()->pageTextNotContains('Are you sure you wish to enable a deprecated module?'); - $this->assertSession()->pageTextNotContains('Are you sure you wish to enable experimental and deprecated modules?'); + $this->assertSession()->pageTextContains('Are you sure you wish to install an experimental module?'); + $this->assertSession()->pageTextNotContains('Are you sure you wish to install a deprecated module?'); + $this->assertSession()->pageTextNotContains('Are you sure you wish to install experimental and deprecated modules?'); // Ensure the non-experimental module is not listed as experimental. $this->assertSession()->pageTextNotContains('The following modules are experimental: Experimental Dependency Test, Experimental Test'); $this->assertSession()->pageTextNotContains('The following module is experimental: Experimental Dependency Test'); // There should be no message about enabling dependencies. - $this->assertSession()->pageTextNotContains('You must enable'); + $this->assertSession()->pageTextNotContains('You must install'); // Enable the module and confirm that it worked. $this->submitForm([], 'Continue'); - $this->assertSession()->pageTextContains('2 modules have been enabled: Experimental Dependency Test, Experimental Test'); + $this->assertSession()->pageTextContains('2 modules have been installed: Experimental Dependency Test, Experimental Test'); // Try to enable an experimental module that can not be due to // hook_requirements(). @@ -186,7 +186,7 @@ public function testDeprecatedConfirmForm(): void { // The module should not be enabled and there should be a warning and a // list of the deprecated modules with only this one. $assert = $this->assertSession(); - $assert->pageTextNotContains('Deprecated module has been enabled.'); + $assert->pageTextNotContains('Deprecated module has been installed.'); $assert->pageTextContains('Deprecated modules are modules that may be removed from the next major release of Drupal core. Use at your own risk.'); $assert->pageTextContains('The Deprecated module module is deprecated'); $more_information_link = $assert->elementExists('named', [ @@ -197,16 +197,16 @@ public function testDeprecatedConfirmForm(): void { // There should be a warning about enabling deprecated modules, but no // warnings about experimental modules. - $this->assertSession()->pageTextContains('Are you sure you wish to enable a deprecated module?'); - $this->assertSession()->pageTextNotContains('Are you sure you wish to enable an experimental module?'); - $this->assertSession()->pageTextNotContains('Are you sure you wish to enable experimental and deprecated modules?'); + $this->assertSession()->pageTextContains('Are you sure you wish to install a deprecated module?'); + $this->assertSession()->pageTextNotContains('Are you sure you wish to install an experimental module?'); + $this->assertSession()->pageTextNotContains('Are you sure you wish to install experimental and deprecated modules?'); // There should be no message about enabling dependencies. - $assert->pageTextNotContains('You must enable'); + $assert->pageTextNotContains('You must install'); // Enable the module and confirm that it worked. $this->submitForm([], 'Continue'); - $assert->pageTextContains('Deprecated module has been enabled.'); + $assert->pageTextContains('Deprecated module has been installed.'); // Uninstall the module. \Drupal::service('module_installer')->uninstall(['deprecated_module']); @@ -220,25 +220,25 @@ public function testDeprecatedConfirmForm(): void { // The module should not be enabled and there should be a warning and a // list of the deprecated modules with only this one. - $assert->pageTextNotContains('2 modules have been enabled: Deprecated module dependency, Deprecated module'); + $assert->pageTextNotContains('2 modules have been installed: Deprecated module dependency, Deprecated module'); $assert->pageTextContains('Deprecated modules are modules that may be removed from the next major release of Drupal core. Use at your own risk.'); $assert->pageTextContains('The Deprecated module module is deprecated'); // There should be a warning about enabling deprecated modules, but no // warnings about experimental modules. - $this->assertSession()->pageTextContains('Are you sure you wish to enable a deprecated module?'); - $this->assertSession()->pageTextNotContains('Are you sure you wish to enable an experimental module?'); - $this->assertSession()->pageTextNotContains('Are you sure you wish to enable experimental and deprecated modules?'); + $this->assertSession()->pageTextContains('Are you sure you wish to install a deprecated module?'); + $this->assertSession()->pageTextNotContains('Are you sure you wish to install an experimental module?'); + $this->assertSession()->pageTextNotContains('Are you sure you wish to install experimental and deprecated modules?'); // Ensure the non-deprecated module is not listed as deprecated. $assert->pageTextNotContains('The Deprecated module dependency module is deprecated'); // There should be a message about enabling dependencies. - $assert->pageTextContains('You must enable the Deprecated module module to install Deprecated module dependency'); + $assert->pageTextContains('You must install the Deprecated module module to install Deprecated module dependency'); // Enable the module and confirm that it worked. $this->submitForm([], 'Continue'); - $assert->pageTextContains('2 modules have been enabled: Deprecated module dependency, Deprecated module'); + $assert->pageTextContains('2 modules have been installed: Deprecated module dependency, Deprecated module'); // Uninstall the modules. \Drupal::service('module_installer')->uninstall([ @@ -254,7 +254,7 @@ public function testDeprecatedConfirmForm(): void { // The module should not be enabled and there should be a warning and a // list of the deprecated modules with only this one. - $assert->pageTextNotContains('2 modules have been enabled: Deprecated module with non deprecated dependency, Drupal system listing compatible test'); + $assert->pageTextNotContains('2 modules have been installed: Deprecated module with non deprecated dependency, Drupal system listing compatible test'); $assert->pageTextContains('Deprecated modules are modules that may be removed from the next major release of Drupal core. Use at your own risk.'); $assert->pageTextContains('The Deprecated module with non deprecated dependency module is deprecated'); $more_information_link = $assert->elementExists('named', [ @@ -265,19 +265,19 @@ public function testDeprecatedConfirmForm(): void { // There should be a warning about enabling deprecated modules, but no // warnings about experimental modules. - $this->assertSession()->pageTextContains('Are you sure you wish to enable a deprecated module?'); - $this->assertSession()->pageTextNotContains('Are you sure you wish to enable an experimental module?'); - $this->assertSession()->pageTextNotContains('Are you sure you wish to enable experimental and deprecated modules?'); + $this->assertSession()->pageTextContains('Are you sure you wish to install a deprecated module?'); + $this->assertSession()->pageTextNotContains('Are you sure you wish to install an experimental module?'); + $this->assertSession()->pageTextNotContains('Are you sure you wish to install experimental and deprecated modules?'); // Ensure the non-deprecated dependency module is not listed as deprecated. $assert->pageTextNotContains('The Drupal system listing compatible test module is deprecated'); // There should be a message about enabling dependencies. - $assert->pageTextContains('You must enable the Drupal system listing compatible test module to install Deprecated module with non deprecated dependency.'); + $assert->pageTextContains('You must install the Drupal system listing compatible test module to install Deprecated module with non deprecated dependency.'); // Enable the module and confirm that it worked. $this->submitForm([], 'Continue'); - $assert->pageTextContains('2 modules have been enabled: Deprecated module with non deprecated dependency, Drupal system listing compatible test.'); + $assert->pageTextContains('2 modules have been installed: Deprecated module with non deprecated dependency, Drupal system listing compatible test.'); // Uninstall the modules. \Drupal::service('module_installer')->uninstall([ @@ -296,25 +296,25 @@ public function testDeprecatedConfirmForm(): void { // The module should not be enabled and there should be a warning and a // list of the deprecated modules with only this one. - $assert->pageTextNotContains('2 modules have been enabled: Deprecated module dependency, Deprecated module'); + $assert->pageTextNotContains('2 modules have been installed: Deprecated module dependency, Deprecated module'); $assert->pageTextContains('Deprecated modules are modules that may be removed from the next major release of Drupal core. Use at your own risk.'); $assert->pageTextContains('The Deprecated module module is deprecated'); // There should be a warning about enabling deprecated modules, but no // warnings about experimental modules. - $this->assertSession()->pageTextContains('Are you sure you wish to enable a deprecated module?'); - $this->assertSession()->pageTextNotContains('Are you sure you wish to enable an experimental module?'); - $this->assertSession()->pageTextNotContains('Are you sure you wish to enable experimental and deprecated modules?'); + $this->assertSession()->pageTextContains('Are you sure you wish to install a deprecated module?'); + $this->assertSession()->pageTextNotContains('Are you sure you wish to install an experimental module?'); + $this->assertSession()->pageTextNotContains('Are you sure you wish to install experimental and deprecated modules?'); // Ensure the non-deprecated module is not listed as deprecated. $assert->pageTextNotContains('The Deprecated module dependency module is deprecated'); // There should be no message about enabling dependencies. - $assert->pageTextNotContains('You must enable'); + $assert->pageTextNotContains('You must install'); // Enable the modules and confirm that it worked. $this->submitForm([], 'Continue'); - $assert->pageTextContains('2 modules have been enabled: Deprecated module, Deprecated module dependency'); + $assert->pageTextContains('2 modules have been installed: Deprecated module, Deprecated module dependency'); \Drupal::service('module_installer')->uninstall([ 'deprecated_module', @@ -327,7 +327,7 @@ public function testDeprecatedConfirmForm(): void { // 'deprecated_module_contrib' to something other than 'core'. $this->drupalGet('admin/modules'); $this->submitForm(["modules[deprecated_module_test][enable]" => TRUE], 'Install'); - $assert->pageTextContains('Module Deprecated module test has been enabled.'); + $assert->pageTextContains('Module Deprecated module test has been installed.'); // Test installing a non-core deprecated module. There should be a // confirmation form with a deprecated warning for a 'project' and not for @@ -362,7 +362,7 @@ public function testDeprecatedAndExperimentalConfirmForm(): void { // The module should not be enabled and there should be a warning and a // list of the deprecated modules with only this one. $assert = $this->assertSession(); - $assert->pageTextNotContains('Deprecated module has been enabled.'); + $assert->pageTextNotContains('Deprecated module has been installed.'); $assert->pageTextContains('Deprecated modules are modules that may be removed from the next major release of Drupal core. Use at your own risk.'); $assert->pageTextContains('The Deprecated module module is deprecated'); $more_information_link = $assert->elementExists('named', [ @@ -373,23 +373,23 @@ public function testDeprecatedAndExperimentalConfirmForm(): void { // The module should not be enabled and there should be a warning and a // list of the experimental modules with only this one. - $assert->pageTextNotContains('Experimental Test has been enabled.'); + $assert->pageTextNotContains('Experimental Test has been installed.'); $assert->pageTextContains('Experimental modules are provided for testing purposes only.'); $assert->pageTextContains('The following module is experimental: Experimental Test'); // There should be a warning about enabling experimental and deprecated // modules, but no warnings about solitary experimental or deprecated // modules. - $this->assertSession()->pageTextContains('Are you sure you wish to enable experimental and deprecated modules?'); - $this->assertSession()->pageTextNotContains('Are you sure you wish to enable experimental modules?'); - $this->assertSession()->pageTextNotContains('Are you sure you wish to enable deprecated modules?'); + $this->assertSession()->pageTextContains('Are you sure you wish to install experimental and deprecated modules?'); + $this->assertSession()->pageTextNotContains('Are you sure you wish to install experimental modules?'); + $this->assertSession()->pageTextNotContains('Are you sure you wish to install deprecated modules?'); // There should be no message about enabling dependencies. - $assert->pageTextNotContains('You must enable'); + $assert->pageTextNotContains('You must install'); // Enable the module and confirm that it worked. $this->submitForm([], 'Continue'); - $assert->pageTextContains('2 modules have been enabled: Deprecated module, Experimental Test.'); + $assert->pageTextContains('2 modules have been installed: Deprecated module, Experimental Test.'); } } diff --git a/core/modules/system/tests/src/Functional/System/DatabaseDriverProvidedByModuleTest.php b/core/modules/system/tests/src/Functional/System/DatabaseDriverProvidedByModuleTest.php index 450651c171c3a460224774b726e2624281b683b2..c44eaac853169580e083cb9b7305043afd04f89e 100644 --- a/core/modules/system/tests/src/Functional/System/DatabaseDriverProvidedByModuleTest.php +++ b/core/modules/system/tests/src/Functional/System/DatabaseDriverProvidedByModuleTest.php @@ -69,10 +69,10 @@ public function testDatabaseDriverIsProvidedByModuleButTheModuleIsNotEnabled(): $this->drupalGet('admin/reports/status'); $this->assertSession()->statusCodeEquals(200); - // The module driver_test is not enabled and is providing to current + // The module driver_test is not installed and is providing to current // database driver. Check that the correct error is shown. $this->assertSession()->pageTextContains('Database driver provided by module'); - $this->assertSession()->pageTextContains('The current database driver is provided by the module: driver_test. The module is currently not enabled. You should immediately enable the module.'); + $this->assertSession()->pageTextContains('The current database driver is provided by the module: driver_test. The module is currently not installed. You should immediately install the module.'); } } diff --git a/core/modules/system/tests/src/Functional/System/MainContentFallbackTest.php b/core/modules/system/tests/src/Functional/System/MainContentFallbackTest.php index acd4da2990d4e9805d58aec3072ff636ea2abf5f..8be703fc08e2b6b98c56d2611131fc78ad89e652 100644 --- a/core/modules/system/tests/src/Functional/System/MainContentFallbackTest.php +++ b/core/modules/system/tests/src/Functional/System/MainContentFallbackTest.php @@ -76,9 +76,9 @@ public function testMainContentFallback() { $edit['modules[block][enable]'] = 'block'; $this->drupalGet('admin/modules'); $this->submitForm($edit, 'Install'); - $this->assertSession()->pageTextContains('Module Block has been enabled.'); + $this->assertSession()->pageTextContains('Module Block has been installed.'); $this->rebuildContainer(); - $this->assertTrue(\Drupal::moduleHandler()->moduleExists('block'), 'Block module re-enabled.'); + $this->assertTrue(\Drupal::moduleHandler()->moduleExists('block'), 'Block module re-installed.'); } } diff --git a/core/modules/system/tests/src/Functional/System/StatusTest.php b/core/modules/system/tests/src/Functional/System/StatusTest.php index 6046732b2acc21a89ba03646194223583e6e390e..ca2217b3c26324bfd310c23782b078e68537b785 100644 --- a/core/modules/system/tests/src/Functional/System/StatusTest.php +++ b/core/modules/system/tests/src/Functional/System/StatusTest.php @@ -126,7 +126,7 @@ public function testStatusPage() { $this->drupalGet('admin/reports/status'); // Confirm warning messages are displayed for the deprecated module. - $session->pageTextContains('Deprecated modules enabled'); + $session->pageTextContains('Deprecated modules installed'); $session->pageTextContains('Deprecated modules found: Deprecated module.'); // Check that the deprecated module link was rendered correctly. @@ -135,12 +135,12 @@ public function testStatusPage() { // Uninstall a deprecated module and confirm the warning is not displayed. $module_installer->uninstall(['deprecated_module']); $this->drupalGet('admin/reports/status'); - $session->pageTextNotContains('Deprecated modules enabled'); + $session->pageTextNotContains('Deprecated modules installed'); $session->pageTextNotContains('Deprecated modules found: Deprecated module.'); $this->assertSession()->elementNotExists('xpath', "//a[contains(@href, 'http://example.com/deprecated')]"); // Make sure there are no warnings about obsolete modules. - $session->pageTextNotContains('Obsolete extensions enabled'); + $session->pageTextNotContains('Obsolete extensions installed'); $session->pageTextNotContains('Obsolete extensions found: System obsolete status test.'); // Install an obsolete module. Normally this isn't possible, so write to @@ -148,7 +148,7 @@ public function testStatusPage() { $this->config('core.extension')->set('module.system_status_obsolete_test', 0)->save(); $this->rebuildAll(); $this->drupalGet('admin/reports/status'); - $session->pageTextContains('Obsolete extensions enabled'); + $session->pageTextContains('Obsolete extensions installed'); $session->pageTextContains('Obsolete extensions found: System obsolete status test.'); $session->pageTextContains('Obsolete extensions are provided only so that they can be uninstalled cleanly. You should immediately uninstall these extensions since they may be removed in a future release.'); $this->assertSession()->elementExists('xpath', "//a[contains(@href, '/admin/modules/uninstall')]"); @@ -156,7 +156,7 @@ public function testStatusPage() { // Make sure the warning is gone after uninstalling the module. $module_installer->uninstall(['system_status_obsolete_test']); $this->drupalGet('admin/reports/status'); - $session->pageTextNotContains('Obsolete extensions enabled'); + $session->pageTextNotContains('Obsolete extensions installed'); $session->pageTextNotContains('Obsolete extensions found: System obsolete status test.'); $session->pageTextNotContains('Obsolete extensions are provided only so that they can be uninstalled cleanly. You should immediately uninstall these extensions since they may be removed in a future release.'); @@ -164,7 +164,7 @@ public function testStatusPage() { $theme_installer = \Drupal::service('theme_installer'); $theme_installer->install(['test_deprecated_theme']); $this->drupalGet('admin/reports/status'); - $session->pageTextContains('Deprecated themes enabled'); + $session->pageTextContains('Deprecated themes installed'); $session->pageTextContains('Deprecated themes found: Test deprecated theme.'); // Check that the deprecated theme link was rendered correctly. @@ -173,7 +173,7 @@ public function testStatusPage() { // Uninstall a deprecated theme and confirm the warning is not displayed. $theme_installer->uninstall(['test_deprecated_theme']); $this->drupalGet('admin/reports/status'); - $session->pageTextNotContains('Deprecated themes enabled'); + $session->pageTextNotContains('Deprecated themes installed'); $session->pageTextNotContains('Deprecated themes found: Test deprecated theme.'); $this->assertSession()->elementNotExists('xpath', "//a[contains(@href, 'http://example.com/deprecated_theme')]"); diff --git a/core/modules/system/tests/src/Functional/Theme/ExperimentalThemeTest.php b/core/modules/system/tests/src/Functional/Theme/ExperimentalThemeTest.php index 6bc73061372561d917b51121bc12aec39bb553fa..a0c66b6316a18d0a9b9e508e6aedad311666c98e 100644 --- a/core/modules/system/tests/src/Functional/Theme/ExperimentalThemeTest.php +++ b/core/modules/system/tests/src/Functional/Theme/ExperimentalThemeTest.php @@ -104,7 +104,7 @@ public function testExperimentalConfirmForm(): void { $this->assertSession()->pageTextNotContains('The following themes are experimental: Experimental dependency test'); // There should be a message about enabling dependencies. - $this->assertSession()->pageTextContains('You must enable the Experimental test theme to install Experimental dependency test'); + $this->assertSession()->pageTextContains('You must install the Experimental test theme to install Experimental dependency test'); // Enable the theme and confirm that it worked. $this->submitForm([], 'Continue'); diff --git a/core/modules/system/tests/src/Functional/Theme/ThemeUiTest.php b/core/modules/system/tests/src/Functional/Theme/ThemeUiTest.php index 2b85faaf72ae882c9a0c9075e3e0c2a028160e38..0765aec8cadc9b93133e0121b9d39ce691e68cd9 100644 --- a/core/modules/system/tests/src/Functional/Theme/ThemeUiTest.php +++ b/core/modules/system/tests/src/Functional/Theme/ThemeUiTest.php @@ -92,7 +92,7 @@ public function testThemeInstallWithModuleDependencies($theme_name, array $first $this->drupalGet('admin/appearance'); $assert_module_enabled_message = function ($enabled_modules) { $count = count($enabled_modules); - $module_enabled_text = $count === 1 ? "{$this->testModules[$enabled_modules[0]]} has been enabled." : $count . " modules have been enabled:"; + $module_enabled_text = $count === 1 ? "{$this->testModules[$enabled_modules[0]]} has been installed." : $count . " modules have been installed:"; $this->assertSession()->pageTextContains($module_enabled_text); }; // All the modules should be listed as disabled. diff --git a/core/modules/update/tests/src/Functional/UpdateTestBase.php b/core/modules/update/tests/src/Functional/UpdateTestBase.php index 755b11c00fc3b1b5030c00135cbbf908db203add..44d3f7d84cdab1e00c25f157e4fdf4dd3f2c7321 100644 --- a/core/modules/update/tests/src/Functional/UpdateTestBase.php +++ b/core/modules/update/tests/src/Functional/UpdateTestBase.php @@ -191,7 +191,7 @@ protected function confirmRevokedStatus($revoked_version, $newer_version, $new_v $this->assertUpdateTableTextContains('Revoked!'); $this->assertUpdateTableTextContains($revoked_version); $this->assertUpdateTableElementContains('error.svg'); - $this->assertUpdateTableTextContains('Release revoked: Your currently installed release has been revoked, and is no longer available for download. Disabling everything included in this release or upgrading is strongly recommended!'); + $this->assertUpdateTableTextContains('Release revoked: Your currently installed release has been revoked, and is no longer available for download. Uninstalling everything included in this release or upgrading is strongly recommended!'); $this->assertVersionUpdateLinks($new_version_label, $newer_version); } @@ -213,7 +213,7 @@ protected function confirmUnsupportedStatus($unsupported_version, $newer_version $this->assertUpdateTableTextContains('Not supported!'); $this->assertUpdateTableTextContains($unsupported_version); $this->assertUpdateTableElementContains('error.svg'); - $this->assertUpdateTableTextContains('Release not supported: Your currently installed release is now unsupported, and is no longer available for download. Disabling everything included in this release or upgrading is strongly recommended!'); + $this->assertUpdateTableTextContains('Release not supported: Your currently installed release is now unsupported, and is no longer available for download. Uninstalling everything included in this release or upgrading is strongly recommended!'); $this->assertVersionUpdateLinks($new_version_label, $newer_version); } diff --git a/core/modules/update/tests/src/Functional/UpdateUploadTest.php b/core/modules/update/tests/src/Functional/UpdateUploadTest.php index 7c60ab7598c179a9dfaf687bcb876f4468569e01..cfa7b844a12dcb1b917b3e7576a5b7df103dc32d 100644 --- a/core/modules/update/tests/src/Functional/UpdateUploadTest.php +++ b/core/modules/update/tests/src/Functional/UpdateUploadTest.php @@ -100,7 +100,7 @@ public function testUploadModule() { // core/authorize.php. $this->assertSession()->linkExists('Add another module'); $this->assertSession()->linkByHrefExists(Url::fromRoute('update.module_install')->toString()); - $this->assertSession()->linkExists('Enable newly added modules'); + $this->assertSession()->linkExists('Install newly added modules'); $this->assertSession()->linkByHrefExists(Url::fromRoute('system.modules_list')->toString()); $this->assertSession()->linkExists('Administration pages'); $this->assertSession()->linkByHrefExists(Url::fromRoute('system.admin')->toString()); diff --git a/core/modules/update/update.compare.inc b/core/modules/update/update.compare.inc index 78d2bdcaf82a670a6fbb041b69143be59d6c0aad..466ca09f68030916eb4a32769b84df18e4327f7c 100644 --- a/core/modules/update/update.compare.inc +++ b/core/modules/update/update.compare.inc @@ -223,7 +223,7 @@ function update_calculate_project_update_status(&$project_data, $available) { } $project_data['extra'][] = [ 'label' => t('Project not secure'), - 'data' => t('This project has been labeled insecure by the Drupal security team, and is no longer available for download. Immediately disabling everything included by this project is strongly recommended!'), + 'data' => t('This project has been labeled insecure by the Drupal security team, and is no longer available for download. Immediately uninstalling everything included by this project is strongly recommended!'), ]; break; @@ -235,7 +235,7 @@ function update_calculate_project_update_status(&$project_data, $available) { } $project_data['extra'][] = [ 'label' => t('Project revoked'), - 'data' => t('This project has been revoked, and is no longer available for download. Disabling everything included by this project is strongly recommended!'), + 'data' => t('This project has been revoked, and is no longer available for download. Uninstalling everything included by this project is strongly recommended!'), ]; break; @@ -246,7 +246,7 @@ function update_calculate_project_update_status(&$project_data, $available) { } $project_data['extra'][] = [ 'label' => t('Project not supported'), - 'data' => t('This project is no longer supported, and is no longer available for download. Disabling everything included by this project is strongly recommended!'), + 'data' => t('This project is no longer supported, and is no longer available for download. Uninstalling everything included by this project is strongly recommended!'), ]; break; @@ -387,7 +387,7 @@ function update_calculate_project_update_status(&$project_data, $available) { $project_data['extra'][] = [ 'class' => ['release-revoked'], 'label' => t('Release revoked'), - 'data' => t('Your currently installed release has been revoked, and is no longer available for download. Disabling everything included in this release or upgrading is strongly recommended!'), + 'data' => t('Your currently installed release has been revoked, and is no longer available for download. Uninstalling everything included in this release or upgrading is strongly recommended!'), ]; } elseif ($release->isUnsupported()) { @@ -398,7 +398,7 @@ function update_calculate_project_update_status(&$project_data, $available) { $project_data['extra'][] = [ 'class' => ['release-not-supported'], 'label' => t('Release not supported'), - 'data' => t('Your currently installed release is now unsupported, and is no longer available for download. Disabling everything included in this release or upgrading is strongly recommended!'), + 'data' => t('Your currently installed release is now unsupported, and is no longer available for download. Uninstalling everything included in this release or upgrading is strongly recommended!'), ]; } }