From 0b9a82827bfc97a66958417aafc9eaa8755e6b66 Mon Sep 17 00:00:00 2001
From: Steve Boyd <emteknetnz@gmail.com>
Date: Mon, 4 Nov 2024 18:39:53 +1300
Subject: [PATCH] TLN Update translations

---
 lang/en.yml                      | 20 ++++++++++++++++++++
 src/ORM/FieldType/DBDatetime.php | 17 +++++++----------
 2 files changed, 27 insertions(+), 10 deletions(-)

diff --git a/lang/en.yml b/lang/en.yml
index adb6d3eb383..35c20794dbd 100644
--- a/lang/en.yml
+++ b/lang/en.yml
@@ -132,6 +132,7 @@ en:
   SilverStripe\Forms\GridField\GridFieldFilterHeader:
     Search: 'Search "{name}"'
     SearchFormFaliure: 'No search form could be generated'
+    Search_Default: Search
   SilverStripe\Forms\GridField\GridFieldGroupDeleteAction:
     UnlinkSelfFailure: 'Cannot remove yourself from this group, you will lose admin rights'
   SilverStripe\Forms\GridField\GridFieldPaginator:
@@ -199,6 +200,25 @@ en:
     YEARS_SHORT_PLURALS:
       one: '{count} year'
       other: '{count} years'
+  SilverStripe\ORM\FieldType\DBDatetime:
+    nDays:
+      one: 'one day'
+      other: '{count} days'
+    nHours:
+      one: 'one hour'
+      other: '{count} hours'
+    nMinutes:
+      one: 'one minute'
+      other: '{count} minutes'
+    nMonths:
+      one: 'one month'
+      other: '{count} months'
+    nSeconds:
+      one: 'one second'
+      other: '{count} seconds'
+    nYears:
+      one: 'one year'
+      other: '{count} years'
   SilverStripe\ORM\FieldType\DBEnum:
     ANY: Any
   SilverStripe\ORM\FieldType\DBForeignKey:
diff --git a/src/ORM/FieldType/DBDatetime.php b/src/ORM/FieldType/DBDatetime.php
index cbc3b8e860f..e43ba665163 100644
--- a/src/ORM/FieldType/DBDatetime.php
+++ b/src/ORM/FieldType/DBDatetime.php
@@ -242,19 +242,16 @@ public static function getTimeBetween(DBDateTime $from, DBDateTime $to): string
                 ['count' => $diff->i]
             );
         }
+        $message = _t(
+            __CLASS__ . '.nSeconds',
+            'one second|{count} seconds',
+            ['count' => $diff->s ?? 0]
+        );
         if ($diff->s) {
-            $result[] = _t(
-                __CLASS__ . '.nSeconds',
-                'one second|{count} seconds',
-                ['count' => $diff->s]
-            );
+            $result[] = $message;
         }
         if (empty($result)) {
-            return _t(
-                __CLASS__ . '.nSeconds',
-                '{count} seconds',
-                ['count' => 0]
-            );
+            return $message;
         }
         return implode(', ', $result);
     }