diff options
| author | José Valim <jose.valim@gmail.com> | 2010-03-26 18:47:55 +0100 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2010-03-26 18:47:55 +0100 |
| commit | 395d6648ce7549f71dd0a76dc061e87f608aaaab (patch) | |
| tree | 4dbb6eb54ff784143bf6e2f671057f0b8162dba5 /activesupport | |
| parent | fc266d7ec2cf1d3f9daf585ea6b79b61467a175f (diff) | |
| download | rails-395d6648ce7549f71dd0a76dc061e87f608aaaab.tar.gz rails-395d6648ce7549f71dd0a76dc061e87f608aaaab.tar.bz2 rails-395d6648ce7549f71dd0a76dc061e87f608aaaab.zip | |
Move application configuration to the application configuration object, remove railtie_name and engine_name and allow to set the configuration object.
Diffstat (limited to 'activesupport')
| -rw-r--r-- | activesupport/lib/active_support/railtie.rb | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/activesupport/lib/active_support/railtie.rb b/activesupport/lib/active_support/railtie.rb index d2c13e030d..e45d16ee96 100644 --- a/activesupport/lib/active_support/railtie.rb +++ b/activesupport/lib/active_support/railtie.rb @@ -3,7 +3,7 @@ require "rails" module ActiveSupport class Railtie < Rails::Railtie - railtie_name :active_support + config.active_support = ActiveSupport::OrderedOptions.new # Loads support for "whiny nil" (noisy warnings when methods are invoked # on +nil+ values) if Configuration#whiny_nils is true. @@ -30,9 +30,7 @@ end module I18n class Railtie < Rails::Railtie - railtie_name :i18n - - # Initialize I18n load paths to an array + config.i18n = ActiveSupport::OrderedOptions.new config.i18n.railties_load_path = [] config.i18n.load_path = [] |