From 1bb497b5373698946d9e353ba37e537f7e142d8c Mon Sep 17 00:00:00 2001 From: Henare Degan Date: Sun, 18 Nov 2012 14:19:28 +1100 Subject: Make simple_date respect the time zone --- app/helpers/link_to_helper.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/helpers/link_to_helper.rb') diff --git a/app/helpers/link_to_helper.rb b/app/helpers/link_to_helper.rb index 994da0e87..48039c8a2 100755 --- a/app/helpers/link_to_helper.rb +++ b/app/helpers/link_to_helper.rb @@ -257,7 +257,7 @@ module LinkToHelper def simple_date(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.in_time_zone.to_date, :format => date_format) end def simple_time(date) -- cgit v1.2.3 From 71f0597c0699fe638dd89635eea2db80e6c0cbff Mon Sep 17 00:00:00 2001 From: Henare Degan Date: Wed, 21 Nov 2012 15:00:09 +1100 Subject: Fix regression by allowing Date objects too --- app/helpers/link_to_helper.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'app/helpers/link_to_helper.rb') diff --git a/app/helpers/link_to_helper.rb b/app/helpers/link_to_helper.rb index 48039c8a2..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.in_time_zone.to_date, :format => date_format) + return I18n.l(date, :format => date_format) end def simple_time(date) -- cgit v1.2.3