diff options
| author | Marcelo Casiraghi <marcelocasiraghi@gmail.com> | 2012-04-23 19:16:02 -0300 |
|---|---|---|
| committer | Alexey Vakhov <vakhov@gmail.com> | 2012-04-24 15:56:35 +0400 |
| commit | 5fdd4cd9e47be972f146a8a17a74c8f4700e2ac0 (patch) | |
| tree | b5b72a770b65a3a357598dbc771315f8f052709e /actionpack/lib/action_view/helpers/date_helper.rb | |
| parent | ff5b0d699d7cef29a45e51890c6b781a0e70925f (diff) | |
| download | rails-5fdd4cd9e47be972f146a8a17a74c8f4700e2ac0.tar.gz rails-5fdd4cd9e47be972f146a8a17a74c8f4700e2ac0.tar.bz2 rails-5fdd4cd9e47be972f146a8a17a74c8f4700e2ac0.zip | |
fixed non matching documentation behaviour with method semantics on distance_of_time_in_words
Diffstat (limited to 'actionpack/lib/action_view/helpers/date_helper.rb')
| -rw-r--r-- | actionpack/lib/action_view/helpers/date_helper.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_view/helpers/date_helper.rb b/actionpack/lib/action_view/helpers/date_helper.rb index c77ec62cae..5b662a8e9c 100644 --- a/actionpack/lib/action_view/helpers/date_helper.rb +++ b/actionpack/lib/action_view/helpers/date_helper.rb @@ -68,7 +68,7 @@ module ActionView 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) from_time, to_time = to_time, from_time if from_time > to_time - distance_in_minutes = ((to_time - from_time)/60).round + distance_in_minutes = ((to_time - from_time)/60.0).round distance_in_seconds = (to_time - from_time).round I18n.with_options :locale => options[:locale], :scope => :'datetime.distance_in_words' do |locale| |