diff options
author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-01-04 00:22:21 -0300 |
---|---|---|
committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-01-04 00:25:08 -0300 |
commit | 39374aa925a7d670b039c0c0c9aa9f4aef19466b (patch) | |
tree | 8e47fa7a1ec65c9729f50691cc3f65ffc91e493d /activesupport/lib/active_support | |
parent | dd3360e05e4909f2f0c74a624cccc2def688f828 (diff) | |
download | rails-39374aa925a7d670b039c0c0c9aa9f4aef19466b.tar.gz rails-39374aa925a7d670b039c0c0c9aa9f4aef19466b.tar.bz2 rails-39374aa925a7d670b039c0c0c9aa9f4aef19466b.zip |
Set the default timezone after the initialization since the configuration
now lives in the application initializers.
Fix #8711
Diffstat (limited to 'activesupport/lib/active_support')
-rw-r--r-- | activesupport/lib/active_support/railtie.rb | 30 |
1 files changed, 16 insertions, 14 deletions
diff --git a/activesupport/lib/active_support/railtie.rb b/activesupport/lib/active_support/railtie.rb index 133aa6a054..72ac597d99 100644 --- a/activesupport/lib/active_support/railtie.rb +++ b/activesupport/lib/active_support/railtie.rb @@ -13,20 +13,6 @@ module ActiveSupport end end - # Sets the default value for Time.zone - # If assigned value cannot be matched to a TimeZone, an exception will be raised. - initializer "active_support.initialize_time_zone" do |app| - require 'active_support/core_ext/time/zones' - zone_default = Time.find_zone!(app.config.time_zone) - - unless zone_default - raise 'Value assigned to config.time_zone not recognized. ' \ - 'Run "rake -D time" for a list of tasks for finding appropriate time zone names.' - end - - Time.zone_default = zone_default - end - # Sets the default week start # If assigned value is not a valid day symbol (e.g. :sunday, :monday, ...), an exception will be raised. initializer "active_support.initialize_beginning_of_week" do |app| @@ -42,5 +28,21 @@ module ActiveSupport ActiveSupport.send(k, v) if ActiveSupport.respond_to? k end end + + # Sets the default value for Time.zone after initialization since the default configuration + # lives in application initializers. + # If assigned value cannot be matched to a TimeZone, an exception will be raised. + config.after_initialize do |app| + require 'active_support/core_ext/time/zones' + zone_default = Time.find_zone!(app.config.time_zone) + + unless zone_default + raise 'Value assigned to config.time_zone not recognized. ' \ + 'Run "rake -D time" for a list of tasks for finding appropriate time zone names.' + end + + Time.zone_default = zone_default + end + end end |