From 0352ab71cf89950f81e29f034529ce16b5bd9105 Mon Sep 17 00:00:00 2001 From: Marius Balteanu Date: Wed, 17 Nov 2021 20:47:53 +0000 Subject: 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 --- config/initializers/10-patches.rb | 4 ---- config/initializers/30-redmine.rb | 9 ++++----- 2 files changed, 4 insertions(+), 9 deletions(-) (limited to 'config/initializers') 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 -- cgit v1.2.3