From d290ed7fa684b33d6e748e5dd6172117e74a2b0c Mon Sep 17 00:00:00 2001
From: "Yasuko Ohba (nay3)" <y.ohba@everyleaf.com>
Date: Fri, 31 Jul 2026 06:39:02 +0900
Subject: [PATCH] =?UTF-8?q?=E3=82=BF=E3=82=A4=E3=83=A0=E3=82=BE=E3=83=BC?=
 =?UTF-8?q?=E3=83=B3=E8=A8=AD=E5=AE=9A=E3=82=92=20application.rb=20?=
 =?UTF-8?q?=E3=81=AB=E6=88=BB=E3=81=97=E3=81=A6=E5=8F=8D=E6=98=A0=E3=81=95?=
 =?UTF-8?q?=E3=82=8C=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config/application.rb                       |  5 +++++
 config/initializers/time_zone_and_locale.rb |  2 --
 spec/config/time_zone_and_locale_spec.rb    | 10 ++++++++++
 3 files changed, 15 insertions(+), 2 deletions(-)
 delete mode 100644 config/initializers/time_zone_and_locale.rb
 create mode 100644 spec/config/time_zone_and_locale_spec.rb

diff --git a/config/application.rb b/config/application.rb
index bfa30fb8..48288092 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -20,5 +20,10 @@ class Application < Rails::Application
     config.active_support.escape_html_entities_in_json = true
     config.active_record.schema_format = :sql
     config.active_record.observers = :user_observer
+
+    # config.time_zone は framework の初期化中に消費されるため、
+    # config/initializers 以下に書いても反映されない。ここに書く必要がある
+    config.time_zone = 'Tokyo'
+    config.i18n.default_locale = 'ja'
   end
 end
diff --git a/config/initializers/time_zone_and_locale.rb b/config/initializers/time_zone_and_locale.rb
deleted file mode 100644
index a8c1f2e6..00000000
--- a/config/initializers/time_zone_and_locale.rb
+++ /dev/null
@@ -1,2 +0,0 @@
-Rails.application.config.time_zone = 'Tokyo'
-Rails.application.config.i18n.default_locale = 'ja'
diff --git a/spec/config/time_zone_and_locale_spec.rb b/spec/config/time_zone_and_locale_spec.rb
new file mode 100644
index 00000000..11c2f4c1
--- /dev/null
+++ b/spec/config/time_zone_and_locale_spec.rb
@@ -0,0 +1,10 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+
+# config.time_zone は config/initializers 以下に書くと反映されないため、
+# 設定が実際に効いていることを検証する
+describe 'タイムゾーンとロケールの設定' do
+  it 'Time.zone が Tokyo、デフォルトロケールが ja になっている' do
+    expect(Time.zone.name).to eq 'Tokyo'
+    expect(I18n.default_locale).to eq :ja
+  end
+end