diff options
| -rwxr-xr-x | app/helpers/link_to_helper.rb | 4 | ||||
| -rw-r--r-- | spec/helpers/link_to_helper_spec.rb | 12 |
2 files changed, 15 insertions, 1 deletions
diff --git a/app/helpers/link_to_helper.rb b/app/helpers/link_to_helper.rb index 994da0e87..030fab20b 100755 --- a/app/helpers/link_to_helper.rb +++ b/app/helpers/link_to_helper.rb @@ -255,9 +255,11 @@ module LinkToHelper # Basic date format def simple_date(date) + date = date.in_time_zone.to_date unless date.is_a? Date + date_format = _("simple_date_format") date_format = :long if date_format == "simple_date_format" - return I18n.l(date.to_date, :format => date_format) + return I18n.l(date, :format => date_format) end def simple_time(date) diff --git a/spec/helpers/link_to_helper_spec.rb b/spec/helpers/link_to_helper_spec.rb index ef89e8bf9..030fd612d 100644 --- a/spec/helpers/link_to_helper_spec.rb +++ b/spec/helpers/link_to_helper_spec.rb @@ -73,4 +73,16 @@ describe LinkToHelper do end end end + + describe 'simple_date' do + it 'should respect time zones' do + Time.use_zone('Australia/Sydney') do + simple_date(Time.utc(2012, 11, 07, 21, 30, 26)).should == 'November 08, 2012' + end + end + + it 'should handle Date objects' do + simple_date(Date.new(2012, 11, 21)).should == 'November 21, 2012' + end + end end |