diff options
| author | Pratik Naik <pratiknaik@gmail.com> | 2010-03-12 16:00:01 +0000 |
|---|---|---|
| committer | Pratik Naik <pratiknaik@gmail.com> | 2010-03-12 16:00:01 +0000 |
| commit | e68bfaf1fe1a7890a67af6f444281185f507cf9e (patch) | |
| tree | 5e73caccdcdd65d0ac97f9eb92195928f30925f2 /activesupport/lib/active_support/i18n.rb | |
| parent | ef6462c73003b28c8e060a06120abb9cd67b6d52 (diff) | |
| parent | 16846553b8866eab2aa3b128a2a23a221a25f7e3 (diff) | |
| download | rails-e68bfaf1fe1a7890a67af6f444281185f507cf9e.tar.gz rails-e68bfaf1fe1a7890a67af6f444281185f507cf9e.tar.bz2 rails-e68bfaf1fe1a7890a67af6f444281185f507cf9e.zip | |
Merge remote branch 'mainstream/master'
Conflicts:
activerecord/lib/active_record/base.rb
railties/lib/rails/configuration.rb
railties/lib/rails/log_subscriber.rb
Diffstat (limited to 'activesupport/lib/active_support/i18n.rb')
| -rw-r--r-- | activesupport/lib/active_support/i18n.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/activesupport/lib/active_support/i18n.rb b/activesupport/lib/active_support/i18n.rb index 854c60eec1..034d7d8ddc 100644 --- a/activesupport/lib/active_support/i18n.rb +++ b/activesupport/lib/active_support/i18n.rb @@ -1,2 +1,3 @@ require 'i18n' -I18n.load_path << "#{File.dirname(__FILE__)}/locale/en.yml"
\ No newline at end of file +I18n.load_path << "#{File.dirname(__FILE__)}/locale/en.yml" +ActiveSupport.run_base_hooks(:i18n)
\ No newline at end of file |