From 9a1118c6033d0bd27b3cac6d79678d7e269aa671 Mon Sep 17 00:00:00 2001
From: Marco Rieser <marco@rieser.dev>
Date: Fri, 8 Mar 2024 08:26:00 +0100
Subject: [PATCH 1/4] create trait

---
 src/Traits/RestoreSite.php | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)
 create mode 100644 src/Traits/RestoreSite.php

diff --git a/src/Traits/RestoreSite.php b/src/Traits/RestoreSite.php
new file mode 100644
index 0000000..f73e289
--- /dev/null
+++ b/src/Traits/RestoreSite.php
@@ -0,0 +1,24 @@
+<?php
+
+namespace Jonassiewertsen\Livewire\Traits;
+
+use Livewire\Attributes\Locked;
+use Statamic\Facades\Site;
+
+trait RestoreSite
+{
+    #[Locked]
+    public string $siteHandle = "";
+
+    public function hydrateRestoreSite(): void
+    {
+        $site = Site::get($this->siteHandle);
+        setlocale(LC_TIME, $site->locale());
+        app()->setLocale($site->shortLocale());
+    }
+
+    protected function storeSiteHandle(): void
+    {
+        $this->siteHandle = Site::current()->handle();
+    }
+}

From d41d3f1e8f0e402a2219d219602f56c1d6034698 Mon Sep 17 00:00:00 2001
From: Marco Rieser <marco@rieser.dev>
Date: Fri, 8 Mar 2024 08:30:30 +0100
Subject: [PATCH 2/4] move trait

---
 src/{Traits => }/RestoreSite.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename src/{Traits => }/RestoreSite.php (91%)

diff --git a/src/Traits/RestoreSite.php b/src/RestoreSite.php
similarity index 91%
rename from src/Traits/RestoreSite.php
rename to src/RestoreSite.php
index f73e289..98f4b31 100644
--- a/src/Traits/RestoreSite.php
+++ b/src/RestoreSite.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Jonassiewertsen\Livewire\Traits;
+namespace Jonassiewertsen\Livewire;
 
 use Livewire\Attributes\Locked;
 use Statamic\Facades\Site;

From f8b2f23f0bafc25e1b3457fcda2b0c8882ce1689 Mon Sep 17 00:00:00 2001
From: Marco Rieser <marco@rieser.dev>
Date: Fri, 8 Mar 2024 08:45:34 +0100
Subject: [PATCH 3/4] some fixes

---
 src/RestoreSite.php | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/RestoreSite.php b/src/RestoreSite.php
index 98f4b31..fd38b7a 100644
--- a/src/RestoreSite.php
+++ b/src/RestoreSite.php
@@ -2,23 +2,29 @@
 
 namespace Jonassiewertsen\Livewire;
 
+use Illuminate\Support\Facades\Date;
 use Livewire\Attributes\Locked;
 use Statamic\Facades\Site;
+use Statamic\Statamic;
 
 trait RestoreSite
 {
     #[Locked]
     public string $siteHandle = "";
 
-    public function hydrateRestoreSite(): void
+    public function mountRestoreSite(): void
     {
-        $site = Site::get($this->siteHandle);
-        setlocale(LC_TIME, $site->locale());
-        app()->setLocale($site->shortLocale());
+        $this->siteHandle = Site::current()->handle();
     }
 
-    protected function storeSiteHandle(): void
+    public function hydrateRestoreSite(): void
     {
-        $this->siteHandle = Site::current()->handle();
+        Site::setCurrent($this->siteHandle);
+
+        $site = Site::current();
+
+        setlocale(LC_TIME, $site->locale());
+        app()->setLocale($site->lang());
+        Date::setToStringFormat(Statamic::dateFormat());
     }
 }

From e08509765ebdb5667266a454360fca1925c03d76 Mon Sep 17 00:00:00 2001
From: Marco Rieser <marco@rieser.dev>
Date: Fri, 8 Mar 2024 08:53:50 +0100
Subject: [PATCH 4/4] rename trait

---
 src/{RestoreSite.php => RestoreCurrentSite.php} | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
 rename src/{RestoreSite.php => RestoreCurrentSite.php} (79%)

diff --git a/src/RestoreSite.php b/src/RestoreCurrentSite.php
similarity index 79%
rename from src/RestoreSite.php
rename to src/RestoreCurrentSite.php
index fd38b7a..eee4146 100644
--- a/src/RestoreSite.php
+++ b/src/RestoreCurrentSite.php
@@ -7,17 +7,17 @@
 use Statamic\Facades\Site;
 use Statamic\Statamic;
 
-trait RestoreSite
+trait RestoreCurrentSite
 {
     #[Locked]
     public string $siteHandle = "";
 
-    public function mountRestoreSite(): void
+    public function mountRestoreCurrentSite(): void
     {
         $this->siteHandle = Site::current()->handle();
     }
 
-    public function hydrateRestoreSite(): void
+    public function hydrateRestoreCurrentSite(): void
     {
         Site::setCurrent($this->siteHandle);