Merge branch '4.x' into 4.13

craftcms · Nov 2, 2024 · 5af1c19 · 5af1c19
2 parents a30b5fa + 095f67f
commit 5af1c19
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/src/translations/sv/app.php b/src/translations/sv/app.php
diff --git a/tests/unit/helpers/DateTimeHelperTest.php b/tests/unit/helpers/DateTimeHelperTest.php
@@ -429,7 +429,12 @@ public function testRelativeTimeStatement(string $expected, int $number, string
      */
     public function testRelativeTimeToSeconds(int $expected, int $number, string $unit): void
     {
-        self::assertSame($expected, DateTimeHelper::relativeTimeToSeconds($number, $unit));
+        // account for DST changes
+        self::assertContains(DateTimeHelper::relativeTimeToSeconds($number, $unit), [
+            $expected,
+            $expected + (60 * 60),
+            $expected - (60 * 60),
+        ]);
     }
 
     /**