diff --git a/core/lib/Drupal/Core/Render/Element/YearRange.php b/core/lib/Drupal/Core/Render/Element/YearRange.php index fb89649..a0e4eed 100644 --- a/core/lib/Drupal/Core/Render/Element/YearRange.php +++ b/core/lib/Drupal/Core/Render/Element/YearRange.php @@ -55,7 +55,7 @@ public static function processRange(&$element, FormStateInterface $form_state, & '#default_value' => $element['#value']['years_back'], '#size' => 10, '#maxsize' => 10, - '#description' => t('Enter a relative value (-9, +9) or an absolute year such as 2015.'), + '#description' => t('Enter a relative value (-9, +9) or an absolute year such as 2015.'), ]; $element['years_forward'] = [ '#type' => 'textfield', @@ -81,8 +81,8 @@ public static function validateRange(&$element, FormStateInterface $form_state, $year_range = $year_range_submitted['years_back'] . ':' . $year_range_submitted['years_forward']; $form_state->setValue($element['#parents'], $year_range); if (!static::rangeIsValid($year_range)) { - $form_state->setError($element['years_back'], t('Starting year must be in the format -9, or an absolute year such as 1980.')); - $form_state->setError($element['years_forward'], t('Ending year must be in the format +9, or an absolute year such as 2030.')); + $form_state->setError($element['years_back'], t('Starting year must be a relative value (-9, +9) or an absolute year such as 1980.')); + $form_state->setError($element['years_forward'], t('Ending year must be a relative value (-9, +9) or an absolute year such as 2030.')); } } @@ -96,7 +96,7 @@ public static function validateRange(&$element, FormStateInterface $form_state, * TRUE if range is valid. */ public static function rangeIsValid($range) { - $matches = preg_match('@^(\-[0-9]+|[0-9]{4}):([\+|\-][0-9]+|[0-9]{4})$@', $range); + $matches = preg_match('@^([\+|\-][0-9]+|[0-9]{4}):([\+|\-][0-9]+|[0-9]{4})$@', $range); return !($matches < 1); }