diff options
| author | Alexey Vakhov <vakhov@gmail.com> | 2012-04-24 08:49:02 +0400 |
|---|---|---|
| committer | Alexey Vakhov <vakhov@gmail.com> | 2012-04-24 15:56:35 +0400 |
| commit | ff5b0d699d7cef29a45e51890c6b781a0e70925f (patch) | |
| tree | 78959942a5db91674d854281211ffe5d62831a1b /actionpack | |
| parent | 0b05380ea77a778b660f2e28e0f080c340c32daf (diff) | |
| download | rails-ff5b0d699d7cef29a45e51890c6b781a0e70925f.tar.gz rails-ff5b0d699d7cef29a45e51890c6b781a0e70925f.tar.bz2 rails-ff5b0d699d7cef29a45e51890c6b781a0e70925f.zip | |
Distance of time in words should work correct if from time > to_time
Diffstat (limited to 'actionpack')
| -rw-r--r-- | actionpack/lib/action_view/helpers/date_helper.rb | 5 | ||||
| -rw-r--r-- | actionpack/test/template/date_helper_test.rb | 1 |
2 files changed, 4 insertions, 2 deletions
diff --git a/actionpack/lib/action_view/helpers/date_helper.rb b/actionpack/lib/action_view/helpers/date_helper.rb index 1f237cd013..c77ec62cae 100644 --- a/actionpack/lib/action_view/helpers/date_helper.rb +++ b/actionpack/lib/action_view/helpers/date_helper.rb @@ -67,8 +67,9 @@ module ActionView def distance_of_time_in_words(from_time, to_time = 0, include_seconds = false, 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_seconds = ((to_time - from_time).abs).round + from_time, to_time = to_time, from_time if from_time > to_time + distance_in_minutes = ((to_time - from_time)/60).round + distance_in_seconds = (to_time - from_time).round I18n.with_options :locale => options[:locale], :scope => :'datetime.distance_in_words' do |locale| case distance_in_minutes diff --git a/actionpack/test/template/date_helper_test.rb b/actionpack/test/template/date_helper_test.rb index c9b8a5bb70..6f6a10472a 100644 --- a/actionpack/test/template/date_helper_test.rb +++ b/actionpack/test/template/date_helper_test.rb @@ -125,6 +125,7 @@ class DateHelperTest < ActionView::TestCase start_date = Date.new 1982, 12, 3 end_date = Date.new 2010, 11, 30 assert_equal("almost 28 years", distance_of_time_in_words(start_date, end_date)) + assert_equal("almost 28 years", distance_of_time_in_words(end_date, start_date)) end def test_distance_in_words_with_integers |