Revert "I18n: use I18n for select helpers' prompt text"

Broke CI. [#2252 state:open] This reverts commit adedf72.
rails · Aug 26, 2009 · a7ca559 · a7ca559
1 parent d672a14
commit a7ca559
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 28 deletions.
diff --git a/actionpack/lib/action_view/helpers/form_options_helper.rb b/actionpack/lib/action_view/helpers/form_options_helper.rb
@@ -571,8 +571,7 @@ def add_options(option_tags, options, value = nil)
             option_tags = "<option value=\"\">#{options[:include_blank] if options[:include_blank].kind_of?(String)}</option>\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')
-            "<option value=\"\">#{prompt}</option>\n" + option_tags
+            ("<option value=\"\">#{options[:prompt].kind_of?(String) ? options[:prompt] : 'Please select'}</option>\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
@@ -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"
diff --git a/actionpack/test/template/form_options_helper_i18n_test.rb b/actionpack/test/template/form_options_helper_i18n_test.rb