Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merging in fix from #8222

  • Loading branch information...
commit 5a6d9d54917e1311a9aef78a82313c296d821150 1 parent 9d7a748
@btucker btucker authored
View
2  actionpack/lib/action_view/helpers/date_helper.rb
@@ -112,7 +112,7 @@ def distance_of_time_in_words(from_time, to_time = 0, include_seconds = false, o
# english it would read better as about 80 years.
minutes_with_offset = distance_in_minutes - minute_offset_for_leap_year
remainder = (minutes_with_offset % 525600)
- distance_in_years = (minutes_with_offset / 525600)
+ distance_in_years = (minutes_with_offset.div 525600)
if remainder < 131400
locale.t(:about_x_years, :count => distance_in_years)
elsif remainder < 394200
View
5 actionpack/test/template/date_helper_test.rb
@@ -19,6 +19,8 @@ def to_param
end
def assert_distance_of_time_in_words(from, to=nil)
+ Fixnum.send :private, :/ # test we avoid Integer#/ (redefined by mathn)
+
to ||= from
# 0..1 with include_seconds
@@ -96,6 +98,9 @@ def assert_distance_of_time_in_words(from, to=nil)
# test to < from
assert_equal "about 4 hours", distance_of_time_in_words(from + 4.hours, to)
assert_equal "less than 20 seconds", distance_of_time_in_words(from + 19.seconds, to, true)
+
+ ensure
+ Fixnum.send :public, :/
end
def test_distance_in_words
Please sign in to comment.
Something went wrong with that request. Please try again.