Fix the i18n dependency problem

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"

activesupport/lib/active_support/all.rb

 require 'active_support'
+require 'active_support/i18n'
 require 'active_support/time'
 require 'active_support/core_ext'

activesupport/lib/active_support/core_ext/array/conversions.rb

 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:

activesupport/lib/active_support/i18n.rb

+require 'i18n'
+I18n.load_path << "#{File.dirname(__FILE__)}/locale/en.yml"
\ No newline at end of file

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'
 

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