Issue #1818692 by mbrett5062, lokapujya, David_Rothstein, blacklight4: Improve...

Issue #1818692 by mbrett5062, lokapujya, David_Rothstein, blacklight4: Improve the maintenance page error message (rollback)

core/includes/errors.inc

@@ -233,7 +233,7 @@ function _drupal_log_error($error, $fatal = FALSE) {
       // We fallback to a maintenance page at this point, because the page generation
       // itself can generate errors.
       // Should not translate the string to avoid errors producing more errors.
-      $message = 'The website has encountered an error. Please try again later.';
+      $message = 'The website encountered an unexpected error. Please try again later.';
       if ($is_installer) {
         // install_display_output() prints the output and ends script execution.
         $output = array(

core/lib/Drupal/Core/EventSubscriber/DefaultExceptionSubscriber.php

@@ -128,7 +128,7 @@ protected function onHtml(GetResponseForExceptionEvent $event) {
       drupal_set_message(SafeMarkup::set($message), $class, TRUE);
     }
 
-    $content = $this->t('The website has encountered an error. Please try again later.');
+    $content = $this->t('The website encountered an unexpected error. Please try again later.');
     $output = $this->bareHtmlPageRenderer->renderBarePage(['#markup' => $content], $this->t('Error'), 'maintenance_page');
     $response = new Response($output);