diff options
author | Joshua Peek <josh@joshpeek.com> | 2009-09-13 12:49:22 -0500 |
---|---|---|
committer | Joshua Peek <josh@joshpeek.com> | 2009-09-13 12:49:22 -0500 |
commit | 870bf8950f606ef50d1b6418a63dd94cf6fbc99e (patch) | |
tree | 7846d8f8ad63e8de9fc3ebfd9375a358595457d1 | |
parent | ec0d4efd7985df6c03c47db845292b919d24eaf0 (diff) | |
download | rails-870bf8950f606ef50d1b6418a63dd94cf6fbc99e.tar.gz rails-870bf8950f606ef50d1b6418a63dd94cf6fbc99e.tar.bz2 rails-870bf8950f606ef50d1b6418a63dd94cf6fbc99e.zip |
Load vendored i18n if its not found since its a real requirement
-rw-r--r-- | activesupport/lib/active_support.rb | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/activesupport/lib/active_support.rb b/activesupport/lib/active_support.rb index 0f2c7706fe..db3f33618e 100644 --- a/activesupport/lib/active_support.rb +++ b/activesupport/lib/active_support.rb @@ -36,5 +36,11 @@ end require 'active_support/autoload' -require 'i18n' +begin + require 'i18n' +rescue LoadError + $: << File.expand_path(File.join(File.dirname(__FILE__), 'active_support/vendor/i18n-0.1.3/lib')) + retry +end + I18n.load_path << "#{File.dirname(__FILE__)}/active_support/locale/en.yml" |