diff options
Diffstat (limited to 'core/modules/system')
13 files changed, 19 insertions, 19 deletions
diff --git a/core/modules/system/src/Controller/Http4xxController.php b/core/modules/system/src/Controller/Http4xxController.php index ee8a9776d4d1..ed8ba3a20aa2 100644 --- a/core/modules/system/src/Controller/Http4xxController.php +++ b/core/modules/system/src/Controller/Http4xxController.php @@ -29,7 +29,7 @@ class Http4xxController extends ControllerBase { */ public function on401() { return [ - '#markup' => $this->t('Please log in to access this page.'), + '#markup' => $this->t('Log in to access this page.'), ]; } diff --git a/core/modules/system/src/Controller/ThemeController.php b/core/modules/system/src/Controller/ThemeController.php index 21fae3ccc5a3..8b21a1d709d0 100644 --- a/core/modules/system/src/Controller/ThemeController.php +++ b/core/modules/system/src/Controller/ThemeController.php @@ -234,7 +234,7 @@ class ThemeController extends ControllerBase { $admin_theme = $config->get('admin'); if (!empty($admin_theme) && $admin_theme != $theme) { $this->messenger() - ->addStatus($this->t('Please note that the administration theme is still set to the %admin_theme theme; consequently, the theme on this page remains unchanged. All non-administrative sections of the site, however, will show the selected %selected_theme theme by default.', [ + ->addStatus($this->t('Note that the administration theme is still set to the %admin_theme theme; consequently, the theme on this page remains unchanged. All non-administrative sections of the site, however, will show the selected %selected_theme theme by default.', [ '%admin_theme' => $themes[$admin_theme]->info['name'], '%selected_theme' => $themes[$theme]->info['name'], ])); diff --git a/core/modules/system/src/Form/ModulesUninstallConfirmForm.php b/core/modules/system/src/Form/ModulesUninstallConfirmForm.php index d28a85c2f310..0af5e4dade92 100644 --- a/core/modules/system/src/Form/ModulesUninstallConfirmForm.php +++ b/core/modules/system/src/Form/ModulesUninstallConfirmForm.php @@ -143,7 +143,7 @@ class ModulesUninstallConfirmForm extends ConfirmFormBase { // Prevent this page from showing when the module list is empty. if (empty($this->modules)) { - $this->messenger()->addError($this->t('The selected modules could not be uninstalled, either due to a website problem or due to the uninstall confirmation form timing out. Please try again.')); + $this->messenger()->addError($this->t('The selected modules could not be uninstalled, either due to a website problem or due to the uninstall confirmation form timing out.')); return $this->redirect('system.modules_uninstall'); } diff --git a/core/modules/system/src/Form/ThemeExperimentalConfirmForm.php b/core/modules/system/src/Form/ThemeExperimentalConfirmForm.php index 9982ac762377..5fc4de2e56f5 100644 --- a/core/modules/system/src/Form/ThemeExperimentalConfirmForm.php +++ b/core/modules/system/src/Form/ThemeExperimentalConfirmForm.php @@ -150,7 +150,7 @@ class ThemeExperimentalConfirmForm extends ConfirmFormBase { $admin_theme = $config->get('admin'); if (!empty($admin_theme) && $admin_theme !== $theme) { $this->messenger() - ->addStatus($this->t('Please note that the administration theme is still set to the %admin_theme theme; consequently, the theme on this page remains unchanged. All non-administrative sections of the site, however, will show the selected %selected_theme theme by default.', [ + ->addStatus($this->t('Note that the administration theme is still set to the %admin_theme theme; consequently, the theme on this page remains unchanged. All non-administrative sections of the site, however, will show the selected %selected_theme theme by default.', [ '%admin_theme' => $themes[$admin_theme]->info['name'], '%selected_theme' => $themes[$theme]->info['name'], ])); diff --git a/core/modules/system/system.install b/core/modules/system/system.install index 027a6ab90360..fae06ecc2724 100644 --- a/core/modules/system/system.install +++ b/core/modules/system/system.install @@ -1289,7 +1289,7 @@ function system_requirements($phase) { break; case 'mbstring.encoding_translation': - $requirements['unicode']['description'] = t('Multibyte string input conversion in PHP is active and must be disabled. Check the php.ini <em>mbstring.encoding_translation</em> setting. Please refer to the <a href="http://php.net/mbstring">PHP mbstring documentation</a> for more information.'); + $requirements['unicode']['description'] = t('Multibyte string input conversion in PHP is active and must be disabled. Check the php.ini <em>mbstring.encoding_translation</em> setting. Refer to the <a href="http://php.net/mbstring">PHP mbstring documentation</a> for more information.'); break; } diff --git a/core/modules/system/tests/modules/form_test/src/Form/FormTestValidateRequiredForm.php b/core/modules/system/tests/modules/form_test/src/Form/FormTestValidateRequiredForm.php index 91be7b1e7fca..ce3438beb6c6 100644 --- a/core/modules/system/tests/modules/form_test/src/Form/FormTestValidateRequiredForm.php +++ b/core/modules/system/tests/modules/form_test/src/Form/FormTestValidateRequiredForm.php @@ -30,14 +30,14 @@ class FormTestValidateRequiredForm extends FormBase { '#type' => 'textfield', '#title' => 'Name', '#required' => TRUE, - '#required_error' => t('Please enter a name.'), + '#required_error' => t('Enter a name.'), ]; $form['checkboxes'] = [ '#type' => 'checkboxes', '#title' => 'Checkboxes', '#options' => $options, '#required' => TRUE, - '#form_test_required_error' => t('Please choose at least one option.'), + '#form_test_required_error' => t('Choose at least one option.'), '#element_validate' => $validate, ]; $form['select'] = [ @@ -45,7 +45,7 @@ class FormTestValidateRequiredForm extends FormBase { '#title' => 'Select', '#options' => $options, '#required' => TRUE, - '#form_test_required_error' => t('Please select something.'), + '#form_test_required_error' => t('Select something.'), '#element_validate' => $validate, ]; $form['radios'] = [ diff --git a/core/modules/system/tests/src/Functional/Common/EarlyRenderingControllerTest.php b/core/modules/system/tests/src/Functional/Common/EarlyRenderingControllerTest.php index 5510a4f719a7..504aa35159fa 100644 --- a/core/modules/system/tests/src/Functional/Common/EarlyRenderingControllerTest.php +++ b/core/modules/system/tests/src/Functional/Common/EarlyRenderingControllerTest.php @@ -63,7 +63,7 @@ class EarlyRenderingControllerTest extends BrowserTestBase { $this->assertSession()->responseHeaderNotContains('X-Drupal-Cache-Tags', 'foo'); $this->drupalGet(Url::fromRoute('early_rendering_controller_test.response-with-attachments.early')); $this->assertSession()->statusCodeEquals(500); - $this->assertSession()->pageTextContains('The controller result claims to be providing relevant cache metadata, but leaked metadata was detected. Please ensure you are not rendering content too early. Returned object class: Drupal\early_rendering_controller_test\AttachmentsTestResponse.'); + $this->assertSession()->pageTextContains('The controller result claims to be providing relevant cache metadata, but leaked metadata was detected. Ensure you are not rendering content too early. Returned object class: Drupal\early_rendering_controller_test\AttachmentsTestResponse.'); // Cacheable Response object: non-early & early. $this->drupalGet(Url::fromRoute('early_rendering_controller_test.cacheable-response')); @@ -72,7 +72,7 @@ class EarlyRenderingControllerTest extends BrowserTestBase { $this->assertSession()->responseHeaderNotContains('X-Drupal-Cache-Tags', 'foo'); $this->drupalGet(Url::fromRoute('early_rendering_controller_test.cacheable-response.early')); $this->assertSession()->statusCodeEquals(500); - $this->assertSession()->pageTextContains('The controller result claims to be providing relevant cache metadata, but leaked metadata was detected. Please ensure you are not rendering content too early. Returned object class: Drupal\early_rendering_controller_test\CacheableTestResponse.'); + $this->assertSession()->pageTextContains('The controller result claims to be providing relevant cache metadata, but leaked metadata was detected. Ensure you are not rendering content too early. Returned object class: Drupal\early_rendering_controller_test\CacheableTestResponse.'); // Basic domain object: non-early & early. $this->drupalGet(Url::fromRoute('early_rendering_controller_test.domain-object')); @@ -91,7 +91,7 @@ class EarlyRenderingControllerTest extends BrowserTestBase { $this->assertSession()->responseHeaderNotContains('X-Drupal-Cache-Tags', 'foo'); $this->drupalGet(Url::fromRoute('early_rendering_controller_test.domain-object-with-attachments.early')); $this->assertSession()->statusCodeEquals(500); - $this->assertSession()->pageTextContains('The controller result claims to be providing relevant cache metadata, but leaked metadata was detected. Please ensure you are not rendering content too early. Returned object class: Drupal\early_rendering_controller_test\AttachmentsTestDomainObject.'); + $this->assertSession()->pageTextContains('The controller result claims to be providing relevant cache metadata, but leaked metadata was detected. Ensure you are not rendering content too early. Returned object class: Drupal\early_rendering_controller_test\AttachmentsTestDomainObject.'); // Cacheable Response object: non-early & early. $this->drupalGet(Url::fromRoute('early_rendering_controller_test.cacheable-domain-object')); @@ -100,7 +100,7 @@ class EarlyRenderingControllerTest extends BrowserTestBase { $this->assertSession()->responseHeaderNotContains('X-Drupal-Cache-Tags', 'foo'); $this->drupalGet(Url::fromRoute('early_rendering_controller_test.cacheable-domain-object.early')); $this->assertSession()->statusCodeEquals(500); - $this->assertSession()->pageTextContains('The controller result claims to be providing relevant cache metadata, but leaked metadata was detected. Please ensure you are not rendering content too early. Returned object class: Drupal\early_rendering_controller_test\CacheableTestDomainObject.'); + $this->assertSession()->pageTextContains('The controller result claims to be providing relevant cache metadata, but leaked metadata was detected. Ensure you are not rendering content too early. Returned object class: Drupal\early_rendering_controller_test\CacheableTestDomainObject.'); // The exceptions are expected. Do not interpret them as a test failure. // Not using File API; a potential error must trigger a PHP warning. diff --git a/core/modules/system/tests/src/Functional/DrupalKernel/ContainerRebuildWebTest.php b/core/modules/system/tests/src/Functional/DrupalKernel/ContainerRebuildWebTest.php index 4a7fad4e7284..55c55eb50821 100644 --- a/core/modules/system/tests/src/Functional/DrupalKernel/ContainerRebuildWebTest.php +++ b/core/modules/system/tests/src/Functional/DrupalKernel/ContainerRebuildWebTest.php @@ -50,7 +50,7 @@ class ContainerRebuildWebTest extends BrowserTestBase { // Ensure that after setting the parameter, without a container rebuild the // parameter is still not set. - $this->writeSettings(['settings' => ['container_rebuild_test_parameter' => (object) ['value' => 'rebuild_me_please', 'required' => TRUE]]]); + $this->writeSettings(['settings' => ['container_rebuild_test_parameter' => (object) ['value' => 'rebuild_me', 'required' => TRUE]]]); $this->drupalGet('<front>'); $assert->responseHeaderEquals('container_rebuild_test_parameter', NULL); @@ -58,7 +58,7 @@ class ContainerRebuildWebTest extends BrowserTestBase { // Ensure that after container invalidation the parameter is set. \Drupal::service('kernel')->invalidateContainer(); $this->drupalGet('<front>'); - $assert->responseHeaderEquals('container_rebuild_test_parameter', 'rebuild_me_please'); + $assert->responseHeaderEquals('container_rebuild_test_parameter', 'rebuild_me'); } } diff --git a/core/modules/system/tests/src/Functional/File/FileSaveHtaccessLoggingTest.php b/core/modules/system/tests/src/Functional/File/FileSaveHtaccessLoggingTest.php index 62a0b7a23d5b..43ebc7f9bfcf 100644 --- a/core/modules/system/tests/src/Functional/File/FileSaveHtaccessLoggingTest.php +++ b/core/modules/system/tests/src/Functional/File/FileSaveHtaccessLoggingTest.php @@ -34,7 +34,7 @@ class FileSaveHtaccessLoggingTest extends BrowserTestBase { $this->assertFalse($htaccess->write($private, TRUE)); $this->drupalLogin($this->rootUser); $this->drupalGet('admin/reports/dblog'); - $this->clickLink("Security warning: Couldn't write .htaccess file. Please…"); + $this->clickLink("Security warning: Couldn't write .htaccess file."); $lines = FileSecurity::htaccessLines(TRUE); foreach (array_filter(explode("\n", $lines)) as $line) { diff --git a/core/modules/system/tests/src/Functional/Menu/MenuRouterTest.php b/core/modules/system/tests/src/Functional/Menu/MenuRouterTest.php index 446ba5111d38..06980db0efd1 100644 --- a/core/modules/system/tests/src/Functional/Menu/MenuRouterTest.php +++ b/core/modules/system/tests/src/Functional/Menu/MenuRouterTest.php @@ -203,7 +203,7 @@ class MenuRouterTest extends BrowserTestBase { "éøïвβ中國書۞"; $this->drupalGet($path); $this->assertSession()->pageTextContains('This is the menuTestCallback content.'); - $this->assertSession()->pageTextNotContains('The website encountered an unexpected error. Please try again later.'); + $this->assertSession()->pageTextNotContains('The website encountered an unexpected error. Try again later.'); } /** diff --git a/core/modules/system/tests/src/Functional/Module/UninstallTest.php b/core/modules/system/tests/src/Functional/Module/UninstallTest.php index 15634f180df1..e797743ae79f 100644 --- a/core/modules/system/tests/src/Functional/Module/UninstallTest.php +++ b/core/modules/system/tests/src/Functional/Module/UninstallTest.php @@ -171,7 +171,7 @@ class UninstallTest extends BrowserTestBase { // Make sure we get an error message when we try to confirm uninstallation // of an empty list of modules. $this->drupalGet('admin/modules/uninstall/confirm'); - $this->assertSession()->pageTextContains('The selected modules could not be uninstalled, either due to a website problem or due to the uninstall confirmation form timing out. Please try again.'); + $this->assertSession()->pageTextContains('The selected modules could not be uninstalled, either due to a website problem or due to the uninstall confirmation form timing out.'); // Make sure confirmation page is accessible only during uninstall process. $this->drupalGet('admin/modules/uninstall/confirm'); diff --git a/core/modules/system/tests/themes/test_theme_settings/theme-settings.php b/core/modules/system/tests/themes/test_theme_settings/theme-settings.php index 7846c7473d4b..f2024ad82eab 100644 --- a/core/modules/system/tests/themes/test_theme_settings/theme-settings.php +++ b/core/modules/system/tests/themes/test_theme_settings/theme-settings.php @@ -17,7 +17,7 @@ function test_theme_settings_form_system_theme_settings_alter(&$form, FormStateI '#title' => t('Secondary logo.'), '#default_value' => theme_get_setting('custom_logo'), '#progress_indicator' => 'bar', - '#progress_message' => t('Please wait...'), + '#progress_message' => t('Processing...'), '#upload_location' => 'public://test', '#upload_validators' => [ 'FileExtension' => ['extensions' => 'gif png jpg jpeg'], diff --git a/core/modules/system/tests/themes/test_theme_theme/test_theme_theme.theme b/core/modules/system/tests/themes/test_theme_theme/test_theme_theme.theme index 6f6a1ca54b2d..07612c2cba95 100644 --- a/core/modules/system/tests/themes/test_theme_theme/test_theme_theme.theme +++ b/core/modules/system/tests/themes/test_theme_theme/test_theme_theme.theme @@ -18,7 +18,7 @@ function test_theme_theme_form_system_theme_settings_alter(&$form, FormStateInte '#title' => t('Secondary logo.'), '#default_value' => theme_get_setting('custom_logo'), '#progress_indicator' => 'bar', - '#progress_message' => t('Please wait...'), + '#progress_message' => t('Processing...'), '#upload_location' => 'public://test', '#upload_validators' => [ 'FileExtension' => ['extensions' => 'gif png jpg jpeg'], |