aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/lib/active_support/i18n.rb
diff options
context:
space:
mode:
authorSantiago Pastorino <santiago@wyeworks.com>2010-05-31 07:31:08 -0300
committerJosé Valim <jose.valim@gmail.com>2010-05-31 12:56:25 +0200
commit1854209bb3d06bc81034dfec4ef75412700eae74 (patch)
tree060a6801dbd315f0c85f01842374fb1ee20c73bc /activesupport/lib/active_support/i18n.rb
parentf5104caf3b36a206aaf8a4355a2b3a73bbf55e5b (diff)
downloadrails-1854209bb3d06bc81034dfec4ef75412700eae74.tar.gz
rails-1854209bb3d06bc81034dfec4ef75412700eae74.tar.bz2
rails-1854209bb3d06bc81034dfec4ef75412700eae74.zip
Unforce i18n from AS
Signed-off-by: José Valim <jose.valim@gmail.com>
Diffstat (limited to 'activesupport/lib/active_support/i18n.rb')
-rw-r--r--activesupport/lib/active_support/i18n.rb9
1 files changed, 7 insertions, 2 deletions
diff --git a/activesupport/lib/active_support/i18n.rb b/activesupport/lib/active_support/i18n.rb
index 11af48d67e..0ffdd904fd 100644
--- a/activesupport/lib/active_support/i18n.rb
+++ b/activesupport/lib/active_support/i18n.rb
@@ -1,3 +1,8 @@
-require 'i18n'
+begin
+ require 'i18n'
+rescue LoadError => e
+ $stderr.puts "You don't have i18n installed in your application. Please add it to your Gemfile and run bundle install"
+ raise e
+end
I18n.load_path << "#{File.dirname(__FILE__)}/locale/en.yml"
-ActiveSupport.run_load_hooks(:i18n) \ No newline at end of file
+ActiveSupport.run_load_hooks(:i18n)