Merge pull request #11452 from creative-commoners/pulls/5/tx-1730698793

TLN Update translations

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:

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);
     }