diff --git a/actionpack/lib/action_view/helpers/form_options_helper.rb b/actionpack/lib/action_view/helpers/form_options_helper.rb
index 3db5202e7d..4620a52272 100644
--- a/actionpack/lib/action_view/helpers/form_options_helper.rb
+++ b/actionpack/lib/action_view/helpers/form_options_helper.rb
@@ -571,8 +571,7 @@ module ActionView
option_tags = "\n" + option_tags
end
if value.blank? && options[:prompt]
- prompt = options[:prompt].kind_of?(String) ? options[:prompt] : I18n.translate('support.select.prompt', :default => 'Please select')
- "\n" + option_tags
+ ("\n") + option_tags
else
option_tags
end
diff --git a/actionpack/lib/action_view/locale/en.yml b/actionpack/lib/action_view/locale/en.yml
index c82cd07ec2..afe35691bc 100644
--- a/actionpack/lib/action_view/locale/en.yml
+++ b/actionpack/lib/action_view/locale/en.yml
@@ -108,7 +108,3 @@
# The variable :count is also available
body: "There were problems with the following fields:"
- support:
- select:
- # default value for :prompt => true in FormOptionsHelper
- prompt: "Please select"
\ No newline at end of file
diff --git a/actionpack/test/template/form_options_helper_i18n_test.rb b/actionpack/test/template/form_options_helper_i18n_test.rb
deleted file mode 100644
index 4f25d41fc9..0000000000
--- a/actionpack/test/template/form_options_helper_i18n_test.rb
+++ /dev/null
@@ -1,22 +0,0 @@
-require 'abstract_unit'
-
-class FormOptionsHelperI18nTests < ActionView::TestCase
- tests ActionView::Helpers::FormOptionsHelper
-
- def setup
- @prompt_message = 'Select!'
- I18n.backend.store_translations :en, :support => { :select => { :prompt => @prompt_message} }
- end
-
- def test_select_with_prompt_true_translates_prompt_message
- I18n.expects(:translate).with('support.select.prompt', { :default => 'Please select' })
- select 'post', 'category', [], :prompt => true
- end
-
- def test_select_with_translated_prompt
- assert_dom_equal(
- %Q(),
- select('post', 'category', [], :prompt => true)
- )
- end
-end
\ No newline at end of file