aboutsummaryrefslogtreecommitdiffstats
path: root/app/helpers/link_to_helper.rb
diff options
context:
space:
mode:
authorHenare Degan <henare.degan@gmail.com>2012-11-21 15:00:09 +1100
committerHenare Degan <henare.degan@gmail.com>2012-11-21 15:00:09 +1100
commit71f0597c0699fe638dd89635eea2db80e6c0cbff (patch)
tree7e7e4675c0bea381d26cc0681a6e9e7106ac61a4 /app/helpers/link_to_helper.rb
parent1bb497b5373698946d9e353ba37e537f7e142d8c (diff)
Fix regression by allowing Date objects too
Diffstat (limited to 'app/helpers/link_to_helper.rb')
-rwxr-xr-xapp/helpers/link_to_helper.rb4
1 files changed, 3 insertions, 1 deletions
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)