1 files changed, 9 insertions, 1 deletions
diff --git a/railties/lib/initializer.rb b/railties/lib/initializer.rb
index f0fb78c8f4..336bff9534 100644
--- a/railties/lib/initializer.rb
+++ b/railties/lib/initializer.rb
@@ -244,7 +244,6 @@ module Rails
     if RUBY_VERSION < '1.9'
       $KCODE='u'
     else
-      Encoding.default_internal = Encoding::UTF_8
       Encoding.default_external = Encoding::UTF_8
     end
   end
@@ -568,4 +567,13 @@ Run `rake gems:install` to install the missing gems.
       ActiveSupport::Dependencies.unhook!
     end
   end
+
+  # Configure generators if they were already loaded
+  Initializer.default.add :initialize_generators do
+    if defined?(Rails::Generators)
+      Rails::Generators.no_color! unless config.generators.colorize_logging
+      Rails::Generators.aliases.deep_merge! config.generators.aliases
+      Rails::Generators.options.deep_merge! config.generators.options
+    end
+  end
 end