diff options
| author | José Valim <jose.valim@gmail.com> | 2011-05-22 13:30:55 +0200 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2011-05-22 13:31:19 +0200 |
| commit | d5646e842fc0537cc1c16b7887039b14bfaf8292 (patch) | |
| tree | bf2e7dda750076a41811c24d67f3fc2a42652868 | |
| parent | 99b5020eb2307dd4f2dc5dbc7ae9d38024176318 (diff) | |
| download | rails-d5646e842fc0537cc1c16b7887039b14bfaf8292.tar.gz rails-d5646e842fc0537cc1c16b7887039b14bfaf8292.tar.bz2 rails-d5646e842fc0537cc1c16b7887039b14bfaf8292.zip | |
Move I18n dependency back to ActiveSupport.
| -rw-r--r-- | actionpack/actionpack.gemspec | 1 | ||||
| -rw-r--r-- | activemodel/activemodel.gemspec | 1 | ||||
| -rw-r--r-- | activesupport/activesupport.gemspec | 7 | ||||
| -rw-r--r-- | activesupport/lib/active_support/i18n.rb | 2 |
4 files changed, 5 insertions, 6 deletions
diff --git a/actionpack/actionpack.gemspec b/actionpack/actionpack.gemspec index 02a65bf468..6beaec7158 100644 --- a/actionpack/actionpack.gemspec +++ b/actionpack/actionpack.gemspec @@ -20,7 +20,6 @@ Gem::Specification.new do |s| s.add_dependency('activemodel', version) s.add_dependency('rack-cache', '~> 1.0.1') s.add_dependency('builder', '~> 3.0.0') - s.add_dependency('i18n', '~> 0.6.0beta1') s.add_dependency('rack', '~> 1.3.0.beta2') s.add_dependency('rack-test', '~> 0.6.0') s.add_dependency('rack-mount', '~> 0.8.1') diff --git a/activemodel/activemodel.gemspec b/activemodel/activemodel.gemspec index 22c0a6224f..30e308d8ad 100644 --- a/activemodel/activemodel.gemspec +++ b/activemodel/activemodel.gemspec @@ -18,6 +18,5 @@ Gem::Specification.new do |s| s.add_dependency('activesupport', version) s.add_dependency('builder', '~> 3.0.0') - s.add_dependency('i18n', '~> 0.6.0beta1') s.add_dependency('bcrypt-ruby', '~> 2.1.4') end diff --git a/activesupport/activesupport.gemspec b/activesupport/activesupport.gemspec index f6eb2be5ae..1804a0896d 100644 --- a/activesupport/activesupport.gemspec +++ b/activesupport/activesupport.gemspec @@ -9,12 +9,13 @@ Gem::Specification.new do |s| s.required_ruby_version = '>= 1.8.7' - s.author = 'David Heinemeier Hansson' - s.email = 'david@loudthinking.com' - s.homepage = 'http://www.rubyonrails.org' + s.author = 'David Heinemeier Hansson' + s.email = 'david@loudthinking.com' + s.homepage = 'http://www.rubyonrails.org' s.files = Dir['CHANGELOG', 'README.rdoc', 'lib/**/*'] s.require_path = 'lib' + s.add_dependency('i18n', '~> 0.6.0beta1') s.add_dependency('multi_json', '~> 1.0') end diff --git a/activesupport/lib/active_support/i18n.rb b/activesupport/lib/active_support/i18n.rb index 00ea8813dd..f9c5e5e2f8 100644 --- a/activesupport/lib/active_support/i18n.rb +++ b/activesupport/lib/active_support/i18n.rb @@ -2,7 +2,7 @@ begin require 'i18n' require 'active_support/lazy_load_hooks' rescue LoadError => e - $stderr.puts "You don't have i18n installed in your application. Please add it to your Gemfile and run bundle install" + $stderr.puts "The i18n gem is not available. Please add it to your Gemfile and run bundle install" raise e end |