From 0243a70caa33b76bc0cf7be9af210965f115e5c8 Mon Sep 17 00:00:00 2001
From: tohosaku <tohosaku@users.osdn.me>
Date: Sat, 23 Oct 2021 11:16:23 +0000
Subject: [PATCH 3/5] Add core extensions in prepare method

---
 config/initializers/10-patches.rb | 4 ----
 config/initializers/30-redmine.rb | 9 ++++-----
 lib/redmine/acts/positioned.rb    | 2 --
 lib/redmine/preparation.rb        | 3 +++
 4 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/config/initializers/10-patches.rb b/config/initializers/10-patches.rb
index 850ab460a..28f4f3670 100644
--- a/config/initializers/10-patches.rb
+++ b/config/initializers/10-patches.rb
@@ -1,11 +1,7 @@
 # frozen_string_literal: true
 
-require 'active_record'
-require 'redmine/i18n'
-
 module ActiveRecord
   class Base
-    include Redmine::I18n
     # Translate attribute names for validation errors display
     def self.human_attribute_name(attr, options = {})
       prepared_attr = attr.to_s.sub(/_id$/, '').sub(/^.+\./, '')
diff --git a/config/initializers/30-redmine.rb b/config/initializers/30-redmine.rb
index 568bcb741..380c783f4 100644
--- a/config/initializers/30-redmine.rb
+++ b/config/initializers/30-redmine.rb
@@ -1,14 +1,13 @@
 # frozen_string_literal: true
 
-require 'redmine/i18n'
 require 'redmine/configuration'
 require 'redmine/plugin_loader'
 
-I18n.backend = Redmine::I18n::Backend.new
-# Forces I18n to load available locales from the backend
-I18n.config.available_locales = nil
-
 Rails.application.config.to_prepare do
+  I18n.backend = Redmine::I18n::Backend.new
+  # Forces I18n to load available locales from the backend
+  I18n.config.available_locales = nil
+
   Redmine::Preparation.prepare
 end
 
diff --git a/lib/redmine/acts/positioned.rb b/lib/redmine/acts/positioned.rb
index ef25e48c7..6ef1bb80c 100644
--- a/lib/redmine/acts/positioned.rb
+++ b/lib/redmine/acts/positioned.rb
@@ -121,5 +121,3 @@ module Redmine
     end
   end
 end
-
-ActiveRecord::Base.send :include, Redmine::Acts::Positioned
diff --git a/lib/redmine/preparation.rb b/lib/redmine/preparation.rb
index 233a83fee..7223f2797 100644
--- a/lib/redmine/preparation.rb
+++ b/lib/redmine/preparation.rb
@@ -20,6 +20,9 @@
 module Redmine
   module Preparation
     def self.prepare
+      ActiveRecord::Base.include Redmine::Acts::Positioned
+      ActiveRecord::Base.include Redmine::I18n
+
       Scm::Base.add "Subversion"
       Scm::Base.add "Mercurial"
       Scm::Base.add "Cvs"
-- 
2.30.2