fixing another timezone dependent test

2 files changed, 6 insertions, 26 deletions

diff --git a/actionpack/lib/action_view/helpers/translation_helper.rb b/actionpack/lib/action_view/helpers/translation_helper.rb
index e1010ccf5f..60ac5c8790 100644
--- a/actionpack/lib/action_view/helpers/translation_helper.rb
+++ b/actionpack/lib/action_view/helpers/translation_helper.rb
@@ -13,7 +13,7 @@ module ActionView
       end
 
       def localize(*args)
-        I18n.l *args
+        I18n.localize *args
       end
     end
   end
diff --git a/actionpack/test/template/translation_helper_test.rb b/actionpack/test/template/translation_helper_test.rb
index 2263d48a65..7b94221ec0 100644
--- a/actionpack/test/template/translation_helper_test.rb
+++ b/actionpack/test/template/translation_helper_test.rb
@@ -18,31 +18,11 @@ class TranslationHelperTest < Test::Unit::TestCase
       expected = '<span class="translation_missing">en-US, foo</span>'
       assert_equal expected, translate(:foo)
     end
-
-    # def test_error_messages_for_given_a_header_message_option_it_does_not_translate_header_message
-    #   I18n.expects(:translate).with(:'header_message', :locale => 'en-US', :scope => [:active_record, :error], :count => 1, :object_name => '').never
-    #   error_messages_for(:object => @object, :header_message => 'header message', :locale => 'en-US')
-    # end
-    # 
-    # def test_error_messages_for_given_no_header_message_option_it_translates_header_message
-    #   I18n.expects(:t).with(:'header_message', :locale => 'en-US', :scope => [:active_record, :error], :count => 1, :object_name => '').returns 'header message'
-    #   error_messages_for(:object => @object, :locale => 'en-US')
-    # end
-    # 
-    # def test_error_messages_for_given_a_message_option_it_does_not_translate_message
-    #   I18n.expects(:t).with(:'message', :locale => 'en-US', :scope => [:active_record, :error]).never
-    #   error_messages_for(:object => @object, :message => 'message', :locale => 'en-US')
-    # end
-    # 
-    # def test_error_messages_for_given_no_message_option_it_translates_message
-    #   I18n.expects(:t).with(:'message', :locale => 'en-US', :scope => [:active_record, :error]).returns 'There were problems with the following fields:'
-    #   error_messages_for(:object => @object, :locale => 'en-US')
-    # end
-  end
   
-  def test_delegates_localize_to_i18n
-    @time = Time.utc(2008, 7, 8, 12, 18, 38)
-    assert_equal "Tue, 08 Jul 2008 12:18:38 +0100", localize(@time)
-    assert_equal "08 Jul 12:18", localize(@time, :format => :short)
+    def test_delegates_localize_to_i18n
+      @time = Time.utc(2008, 7, 8, 12, 18, 38)
+      I18n.expects(:localize).with(@time)
+      localize @time
+    end
   end
 end
\ No newline at end of file