Removed unnecessary or condition in #error_messages_for

rails · Jul 8, 2008 · dc77359 · dc77359
1 parent cf5d6ab
commit dc77359
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/actionpack/lib/action_view/helpers/active_record_helper.rb b/actionpack/lib/action_view/helpers/active_record_helper.rb
@@ -176,7 +176,7 @@ def error_messages_for(*params)
               options[:header_message]
             else 
               object_name = options[:object_name].to_s.gsub('_', ' ')
-              object_name = I18n.t(object_name, :default => object_name) || ''
+              object_name = I18n.t(object_name, :default => object_name)
               locale.t :header_message, :count => count, :object_name => object_name
             end
             message = options.include?(:message) ? options[:message] : locale.t(:message)

diff --git a/actionpack/test/template/active_record_helper_i18n_test.rb b/actionpack/test/template/active_record_helper_i18n_test.rb
@@ -21,19 +21,19 @@ def test_error_messages_for_given_a_header_message_option_it_does_not_translate_
 
     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'
-      I18n.expects(:t).with('', :default => '').once
+      I18n.expects(:t).with('', :default => '').once.returns ''
       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
-      I18n.expects(:t).with('', :default => '').once
+      I18n.expects(:t).with('', :default => '').once.returns ''
       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:'
-      I18n.expects(:t).with('', :default => '').once
+      I18n.expects(:t).with('', :default => '').once.returns ''
       error_messages_for(:object => @object, :locale => 'en-US')
     end