TEST_CODEOWNERS/rails
3
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Lazy load I18n

Browse Source
This commit is contained in:
Santiago Pastorino 2012-05-10 20:48:23 -03:00
parent abd6f4a2b1
commit a00228c1a3
4 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
actionpack/lib/action_view.rb
View File

@ -76,7 +76,8 @@ module ActionView
ENCODING_FLAG = '#.*coding[:=]\s*(\S+)[ \t]*'
end
require 'active_support/i18n'
require 'active_support/core_ext/string/output_safety'
I18n.load_path << "#{File.dirname(__FILE__)}/action_view/locale/en.yml"
ActiveSupport.on_load(:i18n) do
I18n.load_path << "#{File.dirname(__FILE__)}/action_view/locale/en.yml"
end

5
activemodel/lib/active_model.rb
View File

@ -59,5 +59,6 @@ module Serializers
end
end
require 'active_support/i18n'
I18n.load_path << File.dirname(__FILE__) + '/active_model/locale/en.yml'
ActiveSupport.on_load(:i18n) do
I18n.load_path << File.dirname(__FILE__) + '/active_model/locale/en.yml'
end

5
activerecord/lib/active_record.rb
View File

@ -22,7 +22,6 @@
#++
require 'active_support'
require 'active_support/i18n'
require 'active_model'
require 'arel'
require 'active_record_deprecated_finders'
@ -145,4 +144,6 @@ module Scoping
Arel::Table.engine = self
end
I18n.load_path << File.dirname(__FILE__) + '/active_record/locale/en.yml'
ActiveSupport.on_load(:i18n) do
I18n.load_path << File.dirname(__FILE__) + '/active_record/locale/en.yml'
end

1
activesupport/lib/active_support/i18n.rb
View File

@ -6,4 +6,5 @@
raise e
end
ActiveSupport.run_load_hooks(:i18n)
I18n.load_path << "#{File.dirname(__FILE__)}/locale/en.yml"