diff --git a/automatic_updates.module b/automatic_updates.module index 614f6831..cd415bc1 100644 --- a/automatic_updates.module +++ b/automatic_updates.module @@ -106,7 +106,7 @@ function automatic_updates_mail(string $key, array &$message, array $params): vo $url = Url::fromRoute('system.status') ->setAbsolute() ->toString(); - $message['body'][] = t('Your site has failed some readiness checks for automatic updates and may not be able to receive automatic updates until further action is taken. Please visit @url for more information.', [ + $message['body'][] = t('Your site has failed some readiness checks for automatic updates and may not be able to receive automatic updates until further action is taken. Visit @url for more information.', [ '@url' => $url, ], $options); } diff --git a/automatic_updates_extensions/src/Form/UpdaterForm.php b/automatic_updates_extensions/src/Form/UpdaterForm.php index 4b26b7d4..c103eaf3 100644 --- a/automatic_updates_extensions/src/Form/UpdaterForm.php +++ b/automatic_updates_extensions/src/Form/UpdaterForm.php @@ -132,7 +132,7 @@ final class UpdaterForm extends UpdateFormBase { '#empty' => $this->t('There are no available updates.'), '#attributes' => ['class' => ['update-recommended']], '#required' => TRUE, - '#required_error' => t('Please select one or more projects.'), + '#required_error' => t('Select one or more projects.'), ]; if ($form_state->getUserInput()) { diff --git a/automatic_updates_extensions/tests/src/Functional/StatusCheckerRunAfterUpdateTest.php b/automatic_updates_extensions/tests/src/Functional/StatusCheckerRunAfterUpdateTest.php index fd1823f6..6e38eaf9 100644 --- a/automatic_updates_extensions/tests/src/Functional/StatusCheckerRunAfterUpdateTest.php +++ b/automatic_updates_extensions/tests/src/Functional/StatusCheckerRunAfterUpdateTest.php @@ -65,7 +65,7 @@ class StatusCheckerRunAfterUpdateTest extends UpdaterFormTestBase { $page->pressButton('Continue'); $this->checkForMetaRefresh(); $assert_session->pageTextContainsOnce('An error has occurred.'); - $assert_session->pageTextContainsOnce('Please continue to the error page'); + $assert_session->pageTextContainsOnce('Continue to the error page'); $page->clickLink('the error page'); $assert_session->pageTextContains('Some modules have database schema updates to install. You should run the database update script immediately.'); $assert_session->linkExists('database update script'); diff --git a/automatic_updates_extensions/tests/src/Functional/SuccessfulUpdateTest.php b/automatic_updates_extensions/tests/src/Functional/SuccessfulUpdateTest.php index db545fc7..fe0b85e6 100644 --- a/automatic_updates_extensions/tests/src/Functional/SuccessfulUpdateTest.php +++ b/automatic_updates_extensions/tests/src/Functional/SuccessfulUpdateTest.php @@ -82,7 +82,7 @@ class SuccessfulUpdateTest extends UpdaterFormTestBase { // Submit without selecting a project. $page->pressButton('Update'); - $assert_session->pageTextContains('Please select one or more projects.'); + $assert_session->pageTextContains('Select one or more projects.'); // Submit with a project selected. $page->checkField('projects[' . $project_name . ']'); diff --git a/package_manager/package_manager.module b/package_manager/package_manager.module index 742f076b..c6a79c91 100644 --- a/package_manager/package_manager.module +++ b/package_manager/package_manager.module @@ -95,7 +95,7 @@ function package_manager_help($route_name, RouteMatchInterface $route_match) { $output .= ''; $output .= '

' . t('What if it says I have unsupported Composer plugins in my codebase?') . '

'; - $output .= '

' . t('A fresh Drupal installation only uses supported Composer plugins, but some modules or themes may depend on additional Composer plugins. Please create a new issue when you encounter this.', [ + $output .= '

' . t('A fresh Drupal installation only uses supported Composer plugins, but some modules or themes may depend on additional Composer plugins. Create a new issue when you encounter this.', [ ':new-issue' => 'https://www.drupal.org/node/add/project-issue/automatic_updates', ]) . '

'; $output .= '

' . t('It is possible to trust additional Composer plugins, but this requires significant expertise: understanding the code of that Composer plugin, what the effects on the file system are and how it affects the Package Manager module. Some Composer plugins could result in a broken site!') . '

'; diff --git a/src/Controller/UpdateController.php b/src/Controller/UpdateController.php index a5f99c92..7d7c311d 100644 --- a/src/Controller/UpdateController.php +++ b/src/Controller/UpdateController.php @@ -66,7 +66,7 @@ final class UpdateController extends ControllerBase { public function onFinish(Request $request): RedirectResponse { $this->statusChecker->run(); if ($this->pendingUpdatesValidator->updatesExist()) { - $message = $this->t('Please apply database updates to complete the update process.'); + $message = $this->t('Apply database updates to complete the update process.'); $url = Url::fromRoute('system.db_update'); } else { diff --git a/src/Validator/AutomatedCronDisabledValidator.php b/src/Validator/AutomatedCronDisabledValidator.php index 86146917..a98541d9 100644 --- a/src/Validator/AutomatedCronDisabledValidator.php +++ b/src/Validator/AutomatedCronDisabledValidator.php @@ -49,7 +49,7 @@ final class AutomatedCronDisabledValidator implements EventSubscriberInterface { public function validateStatusCheck(StatusCheckEvent $event): void { if ($event->stage instanceof CronUpdateStage && $this->moduleHandler->moduleExists('automated_cron')) { $event->addWarning([ - $this->t('This site has the Automated Cron module installed. To use unattended automatic updates, please configure cron manually on your hosting environment. The Automatic Updates module will not do anything if it is triggered by Automated Cron. See the Automated Cron documentation for information.', [ + $this->t('This site has the Automated Cron module installed. To use unattended automatic updates, configure cron manually on your hosting environment. The Automatic Updates module will not do anything if it is triggered by Automated Cron. See the Automated Cron documentation for information.', [ ':url' => 'https://www.drupal.org/docs/administering-a-drupal-site/cron-automated-tasks/cron-automated-tasks-overview#s-more-reliable-enable-cron-using-external-trigger', ]), ]); diff --git a/tests/src/Functional/StagedDatabaseUpdateTest.php b/tests/src/Functional/StagedDatabaseUpdateTest.php index e34c9f53..071d4048 100644 --- a/tests/src/Functional/StagedDatabaseUpdateTest.php +++ b/tests/src/Functional/StagedDatabaseUpdateTest.php @@ -102,7 +102,7 @@ class StagedDatabaseUpdateTest extends UpdaterFormTestBase { // update.php. $this->assertTrue($state->get('system.maintenance_mode')); $assert_session->pageTextContainsOnce('An error has occurred.'); - $assert_session->pageTextContainsOnce('Please continue to the error page'); + $assert_session->pageTextContainsOnce('Continue to the error page'); $page->clickLink('the error page'); $assert_session->pageTextContains('Some modules have database schema updates to install. You should run the database update script immediately.'); $assert_session->linkExists('database update script'); diff --git a/tests/src/Functional/StatusCheckerRunAfterUpdateTest.php b/tests/src/Functional/StatusCheckerRunAfterUpdateTest.php index bcb60ffa..b057b37a 100644 --- a/tests/src/Functional/StatusCheckerRunAfterUpdateTest.php +++ b/tests/src/Functional/StatusCheckerRunAfterUpdateTest.php @@ -61,7 +61,7 @@ class StatusCheckerRunAfterUpdateTest extends UpdaterFormTestBase { $page->pressButton('Continue'); $this->checkForMetaRefresh(); $assert_session->pageTextContainsOnce('An error has occurred.'); - $assert_session->pageTextContainsOnce('Please continue to the error page'); + $assert_session->pageTextContainsOnce('Continue to the error page'); $page->clickLink('the error page'); $assert_session->pageTextContains('Some modules have database schema updates to install. You should run the database update script immediately.'); $assert_session->linkExists('database update script'); diff --git a/tests/src/Kernel/StatusCheck/AutomatedCronDisabledValidatorTest.php b/tests/src/Kernel/StatusCheck/AutomatedCronDisabledValidatorTest.php index fdccdeab..ee89420d 100644 --- a/tests/src/Kernel/StatusCheck/AutomatedCronDisabledValidatorTest.php +++ b/tests/src/Kernel/StatusCheck/AutomatedCronDisabledValidatorTest.php @@ -25,7 +25,7 @@ class AutomatedCronDisabledValidatorTest extends AutomaticUpdatesKernelTestBase public function testCronUpdateNotAllowed(): void { $expected_results = [ ValidationResult::createWarning([ - t('This site has the Automated Cron module installed. To use unattended automatic updates, please configure cron manually on your hosting environment. The Automatic Updates module will not do anything if it is triggered by Automated Cron. See the Automated Cron documentation for information.', [ + t('This site has the Automated Cron module installed. To use unattended automatic updates, configure cron manually on your hosting environment. The Automatic Updates module will not do anything if it is triggered by Automated Cron. See the Automated Cron documentation for information.', [ ':url' => 'https://www.drupal.org/docs/administering-a-drupal-site/cron-automated-tasks/cron-automated-tasks-overview#s-more-reliable-enable-cron-using-external-trigger', ]), ]), diff --git a/tests/src/Kernel/StatusCheck/StatusCheckFailureEmailTest.php b/tests/src/Kernel/StatusCheck/StatusCheckFailureEmailTest.php index 25ff4cde..9a572a5f 100644 --- a/tests/src/Kernel/StatusCheck/StatusCheckFailureEmailTest.php +++ b/tests/src/Kernel/StatusCheck/StatusCheckFailureEmailTest.php @@ -114,7 +114,7 @@ class StatusCheckFailureEmailTest extends AutomaticUpdatesKernelTestBase { ->toString(); $expected_body = <<assertMessagesSent('Automatic updates readiness checks failed', $expected_body);