From b45c63b8c0d8e8e92207c2d049a5d764aa12a39d Mon Sep 17 00:00:00 2001 From: Carlos Antonio da Silva Date: Tue, 22 Jan 2013 09:29:20 -0200 Subject: Revert "Set the default timezone after the initialization since the configuration" This reverts commit 39374aa925a7d670b039c0c0c9aa9f4aef19466b. --- railties/test/application/configuration_test.rb | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) (limited to 'railties') diff --git a/railties/test/application/configuration_test.rb b/railties/test/application/configuration_test.rb index 78aefa1437..7b45623f6c 100644 --- a/railties/test/application/configuration_test.rb +++ b/railties/test/application/configuration_test.rb @@ -417,17 +417,7 @@ module ApplicationTests require "#{app_path}/config/environment" - assert_equal Time.find_zone!("Wellington"), Time.zone_default - end - - test "timezone can be set on initializers" do - app_file "config/initializers/locale.rb", <<-RUBY - Rails.application.config.time_zone = "Central Time (US & Canada)" - RUBY - - require "#{app_path}/config/environment" - - assert_equal Time.find_zone!("Central Time (US & Canada)"), Time.zone_default + assert_equal "Wellington", Rails.application.config.time_zone end test "raises when an invalid timezone is defined in the config" do -- cgit v1.2.3 From 6fcdcfe1e5fe8780f3c9c56bb4a0b7963f313e4e Mon Sep 17 00:00:00 2001 From: Carlos Antonio da Silva Date: Tue, 22 Jan 2013 09:31:31 -0200 Subject: Revert "Merge pull request #7873 from steveklabnik/update_initializer" This reverts commit 43e14f8ff203c21646f733d35bdde4e68da70a3b, reversing changes made to bb17a0f085aba40a1952612f6c98b2a5804a1152. 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. --- .../rails/generators/rails/app/templates/config/application.rb | 8 ++++++++ .../generators/rails/app/templates/config/initializers/locale.rb | 9 --------- 2 files changed, 8 insertions(+), 9 deletions(-) delete mode 100644 railties/lib/rails/generators/rails/app/templates/config/initializers/locale.rb (limited to 'railties') diff --git a/railties/lib/rails/generators/rails/app/templates/config/application.rb b/railties/lib/rails/generators/rails/app/templates/config/application.rb index f5d7d698a3..d149413e2e 100644 --- a/railties/lib/rails/generators/rails/app/templates/config/application.rb +++ b/railties/lib/rails/generators/rails/app/templates/config/application.rb @@ -22,6 +22,14 @@ module <%= app_const_base %> # 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. diff --git a/railties/lib/rails/generators/rails/app/templates/config/initializers/locale.rb b/railties/lib/rails/generators/rails/app/templates/config/initializers/locale.rb deleted file mode 100644 index d89dac7c6a..0000000000 --- a/railties/lib/rails/generators/rails/app/templates/config/initializers/locale.rb +++ /dev/null @@ -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 -- cgit v1.2.3