diff --git a/src/WebformNavigationHelper.php b/src/WebformNavigationHelper.php index 6faedb9..fcca69a 100644 --- a/src/WebformNavigationHelper.php +++ b/src/WebformNavigationHelper.php @@ -208,6 +208,10 @@ class WebformNavigationHelper { $errors = array_filter($form_errors, function($key) use ($page_elements){ return in_array($key, array_keys($page_elements)); }, ARRAY_FILTER_USE_KEY); + // Strip HTML tags from errors. + $errors = array_map(function($v){ + return trim(strip_tags($v)); + }, $errors); // Stash the errors and return if the submission hasn't been created yet. if (empty($webform_submission->id())) { $page_errors = [$page => $errors]; diff --git a/webformnavigation.module b/webformnavigation.module index acac12f..942d5ff 100644 --- a/webformnavigation.module +++ b/webformnavigation.module @@ -5,7 +5,9 @@ * Contains webformnavigation.module. */ +use Drupal\Component\Render\FormattableMarkup; use Drupal\Core\Form\FormStateInterface; +use Drupal\Core\Render\Markup; use Drupal\Core\Routing\RouteMatchInterface; use Drupal\Core\StringTranslation\TranslatableMarkup; use Drupal\webform\Utility\WebformElementHelper; @@ -234,11 +236,11 @@ function webformnavigation_submission_validation(array &$form, FormStateInterfac if (!empty($page_errors)) { $has_errors = TRUE; // Set an error on the page to create separation in the error message. - $page_message = new TranslatableMarkup('

@title Page

', ['@title' => $page['#title']]); + $page_message = t('

@title Page

', ['@title' => $page['#title']]); $form_state->setErrorByName($page_key, $page_message); // Parse through the errors and set a form error for each. foreach ($page_errors as $field => $error) { - $message = new TranslatableMarkup('     • @message', ['@message' => $error]); + $message = t('     • @message', ['@message' => $error]); $form_state->setErrorByName($field, $message); } } @@ -247,7 +249,7 @@ function webformnavigation_submission_validation(array &$form, FormStateInterfac if ($has_errors && !empty($webform->getThirdPartySetting('webformnavigation', 'additional_error_message'))) { $keys = array_keys($webform->getElementsInitializedAndFlattened()); $additional_error_message = $webform->getThirdPartySetting('webformnavigation', 'additional_error_message'); - $message = new TranslatableMarkup('

@message

', ['@message' => $additional_error_message]); + $message = t('

@message

', ['@message' => $additional_error_message]); $form_state->setErrorByName($keys[1], $message); } }