From 870bf8950f606ef50d1b6418a63dd94cf6fbc99e Mon Sep 17 00:00:00 2001 From: Joshua Peek Date: Sun, 13 Sep 2009 12:49:22 -0500 Subject: Load vendored i18n if its not found since its a real requirement --- activesupport/lib/active_support.rb | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'activesupport') 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" -- cgit v1.2.3