Skip to content
Browse files

Ensure I18n setup is only executed once if triggered on eager loading [

…#6353 state:resolved]
  • Loading branch information...
1 parent 5670062 commit 2fed2658499f4d2b32ed566b5519d43e1bf503b0 @saimonmoore committed Feb 1, 2011
Showing with 20 additions and 12 deletions.
  1. +20 −12 activesupport/lib/active_support/i18n_railtie.rb
View
32 activesupport/lib/active_support/i18n_railtie.rb
@@ -24,8 +24,24 @@ def self.reloader
end
end
- # Proc to set up i18n configuration
- init_load_path = Proc.new do |app|
+ # Set the i18n configuration after initialization since a lot of
+ # configuration is still usually done in application initializers.
+ config.after_initialize do |app|
+ I18n::Railtie.initialize_i18n(app)
+ end
+
+ # Trigger i18n config before any eager loading has happened
+ # so it's ready if any classes require it when eager loaded
+ config.before_eager_load do |app|
+ I18n::Railtie.initialize_i18n(app)
+ end
+
+ protected
+
+ # Setup i18n configuration
+ def self.initialize_i18n(app)
+ return if @i18n_inited
+
fallbacks = app.config.i18n.delete(:fallbacks)
app.config.i18n.each do |setting, value|
@@ -43,17 +59,9 @@ def self.reloader
reloader.paths.concat I18n.load_path
reloader.execute_if_updated
- end
- # Set the i18n configuration only after initialization since a lot of
- # configuration is still usually done in application initializers.
- config.after_initialize(&init_load_path)
-
- # Trigger i18n config before any eager loading has happened
- # so it's ready if any classes require it when eager loaded
- config.before_eager_load(&init_load_path)
-
- protected
+ @i18n_inited = true
+ end
def self.include_fallbacks_module
I18n.backend.class.send(:include, I18n::Backend::Fallbacks)

0 comments on commit 2fed265

Please sign in to comment.
Something went wrong with that request. Please try again.