Skip to content
Snippets Groups Projects
Commit 4ef42b95 authored by quietone's avatar quietone Committed by Adam G-H
Browse files

Issue #3379834 by quietone: Remove please

parent 7deab9ba
No related branches found
No related tags found
1 merge request!989Issue #3356804 by phenaproxima: Flag a warning during status check if the...
Showing with 11 additions and 11 deletions
......@@ -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);
}
......
......@@ -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()) {
......
......@@ -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');
......
......@@ -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 . ']');
......
......@@ -95,7 +95,7 @@ function package_manager_help($route_name, RouteMatchInterface $route_match) {
$output .= '</code></pre>';
$output .= '<h4 id="package-manager-faq-unsupported-composer-plugin">' . t('What if it says I have unsupported Composer plugins in my codebase?') . '</h4>';
$output .= '<p>' . t('A fresh Drupal installation only uses supported Composer plugins, but some modules or themes may depend on additional Composer plugins. Please <a href=":new-issue">create a new issue</a> when you encounter this.', [
$output .= '<p>' . t('A fresh Drupal installation only uses supported Composer plugins, but some modules or themes may depend on additional Composer plugins. <a href=":new-issue">Create a new issue</a> when you encounter this.', [
':new-issue' => 'https://www.drupal.org/node/add/project-issue/automatic_updates',
]) . '</p>';
$output .= '<p>' . t('It is possible to <em>trust</em> 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!') . '</p>';
......
......@@ -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 {
......
......@@ -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 <a href=":url">Automated Cron documentation</a> 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 <a href=":url">Automated Cron documentation</a> 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',
]),
]);
......
......@@ -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');
......
......@@ -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');
......
......@@ -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 <a href=":url">Automated Cron documentation</a> 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 <a href=":url">Automated Cron documentation</a> 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',
]),
]),
......
......@@ -114,7 +114,7 @@ class StatusCheckFailureEmailTest extends AutomaticUpdatesKernelTestBase {
->toString();
$expected_body = <<<END
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.
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.
END;
$this->assertMessagesSent('Automatic updates readiness checks failed', $expected_body);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment