mirror of
https://github.com/rails/rails.git
synced 2022-11-09 12:12:34 -05:00
Move I18n dependency back to ActiveSupport.
This commit is contained in:
parent
99b5020eb2
commit
d5646e842f
4 changed files with 5 additions and 6 deletions
|
@ -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')
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
Loading…
Reference in a new issue