From dfe15ca8e94ec0991bcc4976304a54b9ef3347f0 Mon Sep 17 00:00:00 2001
From: Dave Long <dave@longwaveconsulting.com>
Date: Sat, 3 Feb 2024 17:38:19 +0000
Subject: [PATCH] Issue #3411922 by pradhumanjain2311, Tanuj., divya.sejekan,
Chi, smustgrave: Increase max allowed granularity in Time ago formatter
---
.../Plugin/Field/FieldFormatter/TimestampAgoFormatter.php | 6 +++---
.../tests/src/Kernel/Timestamp/TimestampFormatterTest.php | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/TimestampAgoFormatter.php b/core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/TimestampAgoFormatter.php
index 89e3886f96e2..8e477f236359 100644
--- a/core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/TimestampAgoFormatter.php
+++ b/core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/TimestampAgoFormatter.php
@@ -128,7 +128,7 @@ public function settingsForm(array $form, FormStateInterface $form_state) {
'#description' => $this->t('How many time interval units should be shown in the formatted output.'),
'#default_value' => $this->getSetting('granularity') ?: 2,
'#min' => 1,
- '#max' => 6,
+ '#max' => 7,
];
return $form;
@@ -140,8 +140,8 @@ public function settingsForm(array $form, FormStateInterface $form_state) {
public function settingsSummary() {
$summary = parent::settingsSummary();
- $future_date = new DrupalDateTime('1 year 1 month 1 week 1 day 1 hour 1 minute');
- $past_date = new DrupalDateTime('-1 year -1 month -1 week -1 day -1 hour -1 minute');
+ $future_date = new DrupalDateTime('1 year 1 month 1 week 1 day 1 hour 1 minute 1 second');
+ $past_date = new DrupalDateTime('-1 year -1 month -1 week -1 day -1 hour -1 minute -1 second');
$granularity = $this->getSetting('granularity');
$options = [
'granularity' => $granularity,
diff --git a/core/modules/field/tests/src/Kernel/Timestamp/TimestampFormatterTest.php b/core/modules/field/tests/src/Kernel/Timestamp/TimestampFormatterTest.php
index d846586b4f22..709115c6e61b 100644
--- a/core/modules/field/tests/src/Kernel/Timestamp/TimestampFormatterTest.php
+++ b/core/modules/field/tests/src/Kernel/Timestamp/TimestampFormatterTest.php
@@ -146,7 +146,7 @@ public function testTimestampFormatter() {
public function testTimestampAgoFormatter() {
$data = [];
- foreach ([1, 2, 3, 4, 5, 6] as $granularity) {
+ foreach ([1, 2, 3, 4, 5, 6, 7] as $granularity) {
$data[] = [
'future_format' => '@interval hence',
'past_format' => '@interval ago',
--
GitLab