diff options
Diffstat (limited to 'actionpack/lib/action_view')
| -rwxr-xr-x | actionpack/lib/action_view/helpers/date_helper.rb | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/actionpack/lib/action_view/helpers/date_helper.rb b/actionpack/lib/action_view/helpers/date_helper.rb index 6b1fbf7268..214f9b29d9 100755 --- a/actionpack/lib/action_view/helpers/date_helper.rb +++ b/actionpack/lib/action_view/helpers/date_helper.rb @@ -13,14 +13,19 @@ module ActionView module DateHelper DEFAULT_PREFIX = "date" unless const_defined?("DEFAULT_PREFIX") - # Reports the approximate distance in time between to Time objects. For example, if the distance is 47 minutes, it'll return + # Reports the approximate distance in time between to Time objects or integers. + # For example, if the distance is 47 minutes, it'll return # "about 1 hour". See the source for the complete wording list. - #Set <tt>include_seconds</tt> to true if you want more detailed approximations if distance < 1 minute - def distance_of_time_in_words(from_time, to_time, include_seconds = false) - from_time = from_time.to_time - to_time = to_time.to_time - distance_in_minutes = ((to_time - from_time) / 60).round.abs - distance_in_seconds = ((to_time - from_time)).round.abs + # + # Integers are interpreted as seconds. So, + # <tt>distance_of_time_in_words(50)</tt> returns "less than a minute". + # + # Set <tt>include_seconds</tt> to true if you want more detailed approximations if distance < 1 minute + def distance_of_time_in_words(from_time, to_time = 0, include_seconds = false) + from_time = from_time.to_time if from_time.respond_to?(:to_time) + to_time = to_time.to_time if to_time.respond_to?(:to_time) + distance_in_minutes = (((to_time - from_time).abs)/60).round + distance_in_seconds = ((to_time - from_time).abs).round case distance_in_minutes when 0..1 |