Permalink
Browse files

Fix the i18n dependency problem

  • Loading branch information...
1 parent 9521fcb commit 1cd949006a419807d5ae3400442942b752780ca2 @dhh dhh committed Dec 27, 2009
View
3 activesupport/lib/active_support.rb
@@ -70,6 +70,3 @@ module ActiveSupport
end
require 'active_support/vendor'
-
-require 'i18n'
-I18n.load_path << "#{File.dirname(__FILE__)}/active_support/locale/en.yml"
View
1 activesupport/lib/active_support/all.rb
@@ -1,3 +1,4 @@
require 'active_support'
+require 'active_support/i18n'
require 'active_support/time'
require 'active_support/core_ext'
View
1 activesupport/lib/active_support/core_ext/array/conversions.rb
@@ -1,6 +1,7 @@
require 'active_support/core_ext/hash/keys'
require 'active_support/core_ext/hash/reverse_merge'
require 'active_support/inflector'
+require 'active_support/i18n'
class Array
# Converts the array to a comma-separated sentence where the last element is joined by the connector word. Options:
View
2 activesupport/lib/active_support/i18n.rb
@@ -0,0 +1,2 @@
+require 'i18n'
+I18n.load_path << "#{File.dirname(__FILE__)}/locale/en.yml"
View
2 railties/bin/rails
@@ -20,7 +20,7 @@ end
ARGV << "--help" if ARGV.empty?
-require 'rails'
+
require 'rails/generators'
require 'rails/generators/rails/app/app_generator'
View
7 railties/lib/rails/generators.rb
@@ -4,8 +4,7 @@
require 'active_support'
require 'active_support/core_ext/object/blank'
require 'active_support/core_ext/object/metaclass'
-require 'active_support/core_ext/array'
-require 'active_support/core_ext/hash'
+require 'active_support/core_ext/array/extract_options'
require 'active_support/core_ext/module/attribute_accessors'
require 'active_support/core_ext/string/inflections'
@@ -95,7 +94,7 @@ def self.gems_generators_paths #:nodoc:
end
def self.plugins_generators_paths #:nodoc:
- return [] unless Rails.root
+ return [] unless defined?(Rails.root)
Dir[File.join(Rails.root, "vendor", "plugins", "*", "lib", "{generators,rails_generators}")]
end
@@ -136,7 +135,7 @@ def self.no_color!
def self.load_paths
@load_paths ||= begin
paths = []
- paths += Dir[File.join(Rails.root, "lib", "{generators,rails_generators}")] if Rails.root
+ paths += Dir[File.join(Rails.root, "lib", "{generators,rails_generators}")] if defined?(Rails.root)
paths += Dir[File.join(Thor::Util.user_home, ".rails", "{generators,rails_generators}")]
paths += self.plugins_generators_paths
paths += self.gems_generators_paths

3 comments on commit 1cd9490

@jpartogi

Why do we require 'i18n' inside active_support/i18n.rb?
That cause this error:
active_support/i18n.rb:1:inrequire': no such file to load -- i18n (LoadError)`

@josevalim
Ruby on Rails member

When you require active_support/i18n, is because you want to require i18n and configure its active support hooks.
At that point, you should already have I18n in your loadpath.

@jpartogi

I see. The i18n library has been removed from activesupport/vendor/ now.

Please sign in to comment.