From 6b9356a4b7d5010d65c56e688d6e7a8cece97a57 Mon Sep 17 00:00:00 2001 From: Carlos Antonio da Silva Date: Tue, 2 Jul 2013 22:46:23 -0300 Subject: [PATCH] Remove the deprecated include_seconds argument from distance_of_time_in_words Pass in an :include_seconds hash option to use this feature. --- actionview/CHANGELOG.md | 7 ++++++- actionview/lib/action_view/helpers/date_helper.rb | 10 +--------- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/actionview/CHANGELOG.md b/actionview/CHANGELOG.md index 957fb2fbcc..921ea2be6f 100644 --- a/actionview/CHANGELOG.md +++ b/actionview/CHANGELOG.md @@ -1,4 +1,9 @@ -* Remove deprecated block passing to FormBuilder#new. +* Remove the deprecated `include_seconds` argument from `distance_of_time_in_words`, + pass in an `:include_seconds` hash option to use this feature. + + *Carlos Antonio da Silva* + +* Remove deprecated block passing to `FormBuilder#new`. *Vipul A M* diff --git a/actionview/lib/action_view/helpers/date_helper.rb b/actionview/lib/action_view/helpers/date_helper.rb index 8fb5eb1548..8e1aea50a9 100644 --- a/actionview/lib/action_view/helpers/date_helper.rb +++ b/actionview/lib/action_view/helpers/date_helper.rb @@ -64,15 +64,7 @@ module ActionView # distance_of_time_in_words(from_time, to_time, include_seconds: true) # => about 6 years # distance_of_time_in_words(to_time, from_time, include_seconds: true) # => about 6 years # distance_of_time_in_words(Time.now, Time.now) # => less than a minute - def distance_of_time_in_words(from_time, to_time = 0, include_seconds_or_options = {}, options = {}) - if include_seconds_or_options.is_a?(Hash) - options = include_seconds_or_options - else - ActiveSupport::Deprecation.warn "distance_of_time_in_words and time_ago_in_words now accept :include_seconds " + - "as a part of options hash, not a boolean argument" - options[:include_seconds] ||= !!include_seconds_or_options - end - + def distance_of_time_in_words(from_time, to_time = 0, options = {}) options = { scope: :'datetime.distance_in_words' }.merge!(options)