Permalink
Browse files

Remove the deprecated include_seconds argument from distance_of_time_…

…in_words

Pass in an :include_seconds hash option to use this feature.
  • Loading branch information...
1 parent 127d16e commit 6b9356a4b7d5010d65c56e688d6e7a8cece97a57 @carlosantoniodasilva carlosantoniodasilva committed Jul 3, 2013
Showing with 7 additions and 10 deletions.
  1. +6 −1 actionview/CHANGELOG.md
  2. +1 −9 actionview/lib/action_view/helpers/date_helper.rb
View
@@ -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*
@@ -64,15 +64,7 @@ module DateHelper
# 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)

0 comments on commit 6b9356a

Please sign in to comment.