From 3ab5893cd6bed96a92c081a18d81e421def81447 Mon Sep 17 00:00:00 2001
From: nakamura <shop@goosys.sakura.ne.jp>
Date: Tue, 18 Feb 2025 05:39:10 +0000
Subject: [PATCH] Fix date localization to respect timezone settings

---
 lib/administrate/field/date.rb | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/lib/administrate/field/date.rb b/lib/administrate/field/date.rb
index 1d17b34d97..5041ba118f 100644
--- a/lib/administrate/field/date.rb
+++ b/lib/administrate/field/date.rb
@@ -5,7 +5,7 @@ module Field
     class Date < Base
       def date
         I18n.localize(
-          data.to_date,
+          data.in_time_zone(timezone).to_date,
           format: format
         )
       end
@@ -15,6 +15,10 @@ def date
       def format
         options.fetch(:format, :default)
       end
+
+      def timezone
+        options.fetch(:timezone, ::Time.zone)
+      end
     end
   end
 end