Make simple_date respect the time zone

2 files changed, 9 insertions, 1 deletions

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)
diff --git a/spec/helpers/link_to_helper_spec.rb b/spec/helpers/link_to_helper_spec.rb
index ef89e8bf9..a771a431c 100644
--- a/spec/helpers/link_to_helper_spec.rb
+++ b/spec/helpers/link_to_helper_spec.rb
@@ -73,4 +73,12 @@ 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
+    end
 end