diff options
| author | Louise Crow <louise.crow@gmail.com> | 2013-01-15 15:19:05 +0000 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2013-01-15 15:19:05 +0000 |
| commit | 5f3418307d6087f848eb1fdbf4531d67416121df (patch) | |
| tree | cb7dad95b6b21db3b237efabc9d0fa37879adc10 /app/helpers/link_to_helper.rb | |
| parent | 07121bf22b0929e03215f02b8740c3979ae6c872 (diff) | |
| parent | 7cc8cae3a669fc5de91d6bc23812c265e8af4c93 (diff) | |
Merge branch 'release/0.6.9' into wdtk
Diffstat (limited to 'app/helpers/link_to_helper.rb')
| -rwxr-xr-x | app/helpers/link_to_helper.rb | 4 |
1 files changed, 3 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) |