use site locale

Author: edalzell

src/Modifiers/IsEndOfWeek.php

@@ -3,16 +3,26 @@
 namespace TransformStudios\Events\Modifiers;
 
 use Carbon\CarbonImmutable;
+use Statamic\Facades\Site;
 use Statamic\Modifiers\Modifier;
 
 class IsEndOfWeek extends Modifier
 {
     public function index($value, $params, $context)
     {
+        /*
+            have to do this because Statamic sets the Carbon locale
+            to the `lang` of the site, instead of the `locale`
+        */
+        $currentLocale = CarbonImmutable::getLocale();
+        CarbonImmutable::setLocale(Site::current()->locale());
+
         $date = CarbonImmutable::parse($value);
 
-        $date->isSameDay($date->locale(CarbonImmutable::getLocale())->startOfWeek());
+        $isStartOfWeek = $date->dayOfWeek == now()->endOfWeek()->dayOfWeek;
+
+        CarbonImmutable::setLocale($currentLocale);
 
-        return $date->dayOfWeek == now()->endOfWeek()->dayOfWeek;
+        return $isStartOfWeek;
     }
 }

src/Modifiers/IsStartOfWeek.php

@@ -3,16 +3,26 @@
 namespace TransformStudios\Events\Modifiers;
 
 use Carbon\CarbonImmutable;
+use Statamic\Facades\Site;
 use Statamic\Modifiers\Modifier;
 
 class IsStartOfWeek extends Modifier
 {
     public function index($value, $params, $context)
     {
+        /*
+            have to do this because Statamic sets the Carbon locale
+            to the `lang` of the site, instead of the `locale`
+        */
+        $currentLocale = CarbonImmutable::getLocale();
+        CarbonImmutable::setLocale(Site::current()->locale());
+
         $date = CarbonImmutable::parse($value);
 
-        $date->isSameDay($date->locale(CarbonImmutable::getLocale())->startOfWeek());
+        $isStartOfWeek = $date->dayOfWeek == now()->startOfWeek()->dayOfWeek;
+
+        CarbonImmutable::setLocale($currentLocale);
 
-        return $date->dayOfWeek == now()->startOfWeek()->dayOfWeek;
+        return $isStartOfWeek;
     }
 }

src/Tags/Events.php

@@ -13,6 +13,7 @@
 use Statamic\Entries\Entry;
 use Statamic\Entries\EntryCollection;
 use Statamic\Facades\Compare;
+use Statamic\Facades\Site;
 use Statamic\Support\Arr;
 use Statamic\Support\Str;
 use Statamic\Tags\Concerns\OutputsItems;
@@ -50,12 +51,23 @@ public function calendar(): Collection
 
     public function daysOfWeek(): Collection
     {
-        return collect(CarbonPeriod::dates(now()->startOfWeek(), now()->endOfWeek()))
+        /*
+            have to do this because Statamic sets the Carbon locale
+            to the `lang` of the site, instead of the `locale`
+        */
+        $currentLocale = Carbon::getLocale();
+        Carbon::setLocale(Site::current()->locale());
+
+        $days = collect(CarbonPeriod::dates(now()->startOfWeek(), now()->endOfWeek()))
             ->map(fn (Carbon $date) => [
                 'short' => $date->format('D')[0],
                 'medium' => $date->format('D'),
                 'long' => $date->format('l'),
             ]);
+
+        Carbon::setLocale($currentLocale);
+
+        return $days;
     }
 
     public function downloadLink(): string

tests/Modifiers/IsStartOfWeekTest.php

@@ -0,0 +1,26 @@
+<?php
+
+use Carbon\Carbon;
+use Statamic\Facades\Site as SiteFacade;
+use Statamic\Modifiers\Modify;
+use Statamic\Sites\Site;
+
+it('uses current sites locale to determine start of week', function () {
+    SiteFacade::shouldReceive('current')
+        ->andReturn(new Site('default', [
+            'name' => 'Laravel',
+            'url' => '/',
+            'locale' => 'en_US',
+            'lang' => 'en',
+        ], true));
+
+    Carbon::setTestNow('2026-3-25 12:00pm');
+
+    $modified = modify('2026-3-22');
+    expect($modified)->toBe(true);
+});
+
+function modify(string $value)
+{
+    return Modify::value($value)->isStartOfWeek()->fetch();
+}

tests/Tags/EventsTest.php

@@ -5,6 +5,8 @@
 use Illuminate\Support\Carbon;
 use Statamic\Facades\Cascade;
 use Statamic\Facades\Entry;
+use Statamic\Facades\Site as SiteFacade;
+use Statamic\Sites\Site;
 use Statamic\Support\Arr;
 use TransformStudios\Events\Tags\Events;
 
@@ -387,3 +389,23 @@
 
     expect($this->tag->today())->toHaveCount(0);
 });
+
+it('sets the correct short form of the days of week', function () {
+    expect($this->tag->daysOfWeek())->pluck('short')->toBe(['M', 'Tu', 'W', 'Th', 'F', 'Sa', 'Su']);
+});
+
+it('uses the current site locale to get days of week', function () {
+    SiteFacade::shouldReceive('current')
+        ->andReturn(new Site('default', [
+            'name' => 'Laravel',
+            'url' => '/',
+            'locale' => 'en_US',
+            'lang' => 'en',
+        ], true));
+
+    expect($this->tag->daysOfWeek())->first()->toBe([
+        'short' => 'S',
+        'medium' => 'Sun',
+        'long' => 'Sunday',
+    ]);
+});

tests/TestCase.php

@@ -28,15 +28,6 @@ abstract class TestCase extends AddonTestCase
 
     protected Blueprint $blueprint;
 
-    protected function setUp(): void
-    {
-        parent::setUp();
-
-        if (! file_exists($this->fakeStacheDirectory)) {
-            mkdir($this->fakeStacheDirectory, 0777, true);
-        }
-    }
-
     protected function getEnvironmentSetUp($app)
     {
         parent::getEnvironmentSetUp($app);