mirror of
https://github.com/rails/rails.git
synced 2022-11-09 12:12:34 -05:00
3b7947ea31
Conflicts: actionmailer/lib/action_mailer/base.rb activesupport/lib/active_support/configurable.rb activesupport/lib/active_support/core_ext/module/deprecation.rb guides/source/action_controller_overview.md guides/source/active_support_core_extensions.md guides/source/ajax_on_rails.textile guides/source/association_basics.textile guides/source/upgrading_ruby_on_rails.md While resolving conflicts, I have chosen to ignore changes done in docrails at some places - these will be most likely 1.9 hash syntax changes.
46 lines
1.6 KiB
Ruby
46 lines
1.6 KiB
Ruby
require "active_support"
|
|
require "active_support/i18n_railtie"
|
|
|
|
module ActiveSupport
|
|
class Railtie < Rails::Railtie # :nodoc:
|
|
config.active_support = ActiveSupport::OrderedOptions.new
|
|
|
|
config.eager_load_namespaces << ActiveSupport
|
|
|
|
initializer "active_support.deprecation_behavior" do |app|
|
|
if deprecation = app.config.active_support.deprecation
|
|
ActiveSupport::Deprecation.behavior = deprecation
|
|
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|
|
|
require 'active_support/core_ext/date/calculations'
|
|
beginning_of_week_default = Date.find_beginning_of_week!(app.config.beginning_of_week)
|
|
|
|
Date.beginning_of_week_default = beginning_of_week_default
|
|
end
|
|
|
|
initializer "active_support.set_configs" do |app|
|
|
app.config.active_support.each do |k, v|
|
|
k = "#{k}="
|
|
ActiveSupport.send(k, v) if ActiveSupport.respond_to? k
|
|
end
|
|
end
|
|
end
|
|
end
|