Skip to content
Browse files

Revert "Merge pull request #7873 from steveklabnik/update_initializer"

This reverts commit 43e14f8, reversing
changes made to bb17a0f.

Conflicts:
	railties/lib/rails/generators/rails/app/templates/config/application.rb
	railties/lib/rails/generators/rails/app/templates/config/initializers/locale.rb

Reason: setting the Time.zone in an after_initialize block can become a
problem for people upgrading, since it's not going to be available when
config/initializers run, and people might be relying on it.

An example that I noticed was with the Chronic gem, for date/time parsing.
It requires us to configure the time class to be Time.zone, and doing
that in an initializer no longer worked with these changes, so reverting
is the safer path for now.
  • Loading branch information...
1 parent b45c63b commit 6fcdcfe1e5fe8780f3c9c56bb4a0b7963f313e4e @carlosantoniodasilva committed Jan 22, 2013
View
8 railties/lib/rails/generators/rails/app/templates/config/application.rb
@@ -22,6 +22,14 @@ class Application < Rails::Application
# Custom directories with classes and modules you want to be autoloadable.
# config.autoload_paths += %W(#{config.root}/extras)
+
+ # Set Time.zone default to the specified zone and make Active Record auto-convert to this zone.
+ # Run "rake -D time" for a list of tasks for finding time zone names. Default is UTC.
+ # config.time_zone = 'Central Time (US & Canada)'
+
+ # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
+ # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
+ # config.i18n.default_locale = :de
<% if options.skip_sprockets? -%>
# Disable the asset pipeline.
View
9 railties/lib/rails/generators/rails/app/templates/config/initializers/locale.rb
@@ -1,9 +0,0 @@
-# Be sure to restart your server when you modify this file.
-
-# Set Time.zone default to the specified zone and make Active Record auto-convert to this zone.
-# Run "rake -D time" for a list of tasks for finding time zone names. Default is UTC.
-# Rails.application.config.time_zone = 'Central Time (US & Canada)'
-
-# The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
-# Rails.application.config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
-# Rails.application.config.i18n.default_locale = :de

0 comments on commit 6fcdcfe

Please sign in to comment.
Something went wrong with that request. Please try again.