Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

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

Broke CI.

[#2252 state:open]

This reverts commit d725ad3.
  • Loading branch information...
commit 3cd245b7fa8bf6afea1c41af503a6a1db28450a9 1 parent a4838ee
@jeremy jeremy authored
View
3  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
View
4 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"
View
22 actionpack/test/template/form_options_helper_i18n_test.rb
@@ -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 id="post_category" name="post[category]"><option value="">#{@prompt_message}</option>\n</select>),
- select('post', 'category', [], :prompt => true)
- )
- end
-end
Please sign in to comment.
Something went wrong with that request. Please try again.