diff --git a/app/helpers/dates_helper.rb b/app/helpers/dates_helper.rb index 4ecd670..eb57dfd 100644 --- a/app/helpers/dates_helper.rb +++ b/app/helpers/dates_helper.rb @@ -36,7 +36,7 @@ module DatesHelper # formats a datetime for displaying. def show_time(time) if time - _('%{day} %{month} %{year}, %{hour}:%{minutes}') % { :year => time.year, :month => month_name(time.month), :day => time.day, :hour => time.hour, :minutes => time.min } + _('%{day} %{month} %{year}, %{hour}:%{minutes}') % { :year => time.year, :month => month_name(time.month), :day => time.day, :hour => time.hour, :minutes => time.strftime("%M") } else '' end diff --git a/test/unit/dates_helper_test.rb b/test/unit/dates_helper_test.rb index 2644241..87b2e65 100644 --- a/test/unit/dates_helper_test.rb +++ b/test/unit/dates_helper_test.rb @@ -148,6 +148,10 @@ class DatesHelperTest < Test::Unit::TestCase assert_equal '22 November 2008, 15:34', show_time(Time.mktime(2008, 11, 22, 15, 34, 0, 0)) end + should 'format time with 2 digits minutes' do + assert_equal '22 November 2008, 15:04', show_time(Time.mktime(2008, 11, 22, 15, 04, 0, 0)) + end + should 'translate time' do time = Time.parse('25 May 2009, 12:47') expects(:_).with('%{day} %{month} %{year}, %{hour}:%{minutes}').returns('translated time') -- libgit2 0.21.2