diff options
| author | Andrew White <andyw@pixeltrix.co.uk> | 2012-12-04 14:04:53 +0000 |
|---|---|---|
| committer | Andrew White <andyw@pixeltrix.co.uk> | 2012-12-04 14:21:52 +0000 |
| commit | 18e12273121d5d46be9d87b07cd9935edc58472a (patch) | |
| tree | 99e083c30f0c0d69877ac3545b4a15d4bc75c1f6 /actionpack/lib/action_view | |
| parent | 549da0dd8f88179485b45338bea383fe61775624 (diff) | |
| download | rails-18e12273121d5d46be9d87b07cd9935edc58472a.tar.gz rails-18e12273121d5d46be9d87b07cd9935edc58472a.tar.bz2 rails-18e12273121d5d46be9d87b07cd9935edc58472a.zip | |
Make output of distance_of_time_in_words consistent
This commit fixes the output of distance_of_time_in_words when
using integer or duration arguments. Previously a distance of
more than 30 seconds would be output as 'Less than 1 minute'
when using integer arguments and '1 minute' when using two
Time instances more than 30 seconds apart.
Cherry picked from 5fdd4cd9e47be972f146a8a17a74c8f4700e2ac0
Diffstat (limited to 'actionpack/lib/action_view')
| -rw-r--r-- | actionpack/lib/action_view/helpers/date_helper.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_view/helpers/date_helper.rb b/actionpack/lib/action_view/helpers/date_helper.rb index cb3e8b9d7f..e5a27389f1 100644 --- a/actionpack/lib/action_view/helpers/date_helper.rb +++ b/actionpack/lib/action_view/helpers/date_helper.rb @@ -68,10 +68,10 @@ module ActionView options = { :scope => :'datetime.distance_in_words', }.merge!(options) - + 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_minutes = (((to_time - from_time).abs)/60.0).round distance_in_seconds = ((to_time - from_time).abs).round I18n.with_options :locale => options[:locale], :scope => options[:scope] do |locale| |