Add core extensions in prepare method (#29914, #32938).

Patch by Takashi Kato.

git-svn-id: http://svn.redmine.org/redmine/trunk@21285 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/config/initializers/10-patches.rb b/config/initializers/10-patches.rb
index 850ab460a96c2400e09787fe793b91c0416b20d2..28f4f367093ed430319db9355c1a1bd73f3b5e42 100644 (file)
--- 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 568bcb7418c3c18ca79749aea8537c77eed8226c..380c783f4c024f2b920614e7a00e2f461ae2fd5a 100644 (file)
--- 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 ef25e48c7610518d74719a3a695a88067bde2864..6ef1bb80c705f27cdd9c4d06de0d35d123452cd6 100644 (file)
--- 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 233a83fee89c2fa6bda1d5c4ecf1e2e09c6c6546..7223f2797387a87f0c819ef83d03f0c561fdfef2 100644 (file)
--- 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"