diff options
| author | Lawrence Pit <lawrence.pit@gmail.com> | 2009-07-06 11:42:41 +1000 |
|---|---|---|
| committer | Yehuda Katz <wycats@gmail.com> | 2009-07-07 18:36:42 -0700 |
| commit | 579250ea467ac406a5897dc2187c7959bf343b4f (patch) | |
| tree | 94f94fdda84916d9bc806d1e8cadae67dee9273c /activesupport | |
| parent | da635394c1c3004f4dacf4a35275404e5b1aef43 (diff) | |
| download | rails-579250ea467ac406a5897dc2187c7959bf343b4f.tar.gz rails-579250ea467ac406a5897dc2187c7959bf343b4f.tar.bz2 rails-579250ea467ac406a5897dc2187c7959bf343b4f.zip | |
Use the i18n gem if present instead of vendor code. [#2871 state:resolved]
Signed-off-by: Yehuda Katz <wycats@gmail.com>
Diffstat (limited to 'activesupport')
| -rw-r--r-- | activesupport/lib/active_support/vendor.rb | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/activesupport/lib/active_support/vendor.rb b/activesupport/lib/active_support/vendor.rb index b6223fe20a..ca64c5ebe3 100644 --- a/activesupport/lib/active_support/vendor.rb +++ b/activesupport/lib/active_support/vendor.rb @@ -19,10 +19,9 @@ rescue Gem::LoadError $:.unshift "#{File.dirname(__FILE__)}/vendor/tzinfo-0.3.13" end -# TODO I18n gem has not been released yet -# begin -# gem 'i18n', '~> 0.1.3' -# rescue Gem::LoadError +begin + gem 'i18n', '~> 0.1.3' +rescue Gem::LoadError $:.unshift "#{File.dirname(__FILE__)}/vendor/i18n-0.1.3/lib" require 'i18n' -# end +end |