kotovalexarian-likes-github/heartcombo--simple_form
1
0
Fork 0
mirror of https://github.com/heartcombo/simple_form.git synced 2022-11-09 12:19:26 -05:00
Code Releases Activity

Revert "Translate the attributes prefixed with _html to keep the html markup."

Browse source 
This reverts commit 337fce04f3.
This commit is contained in:
José Valim 2015-09-07 10:01:19 +02:00
parent 451e25de1b
commit 63fbc2d5a8
2 changed files with 0 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/simple_form/inputs/base.rb
View file

@ -178,14 +178,10 @@ module SimpleForm
model_names.shift
lookups << :"#{joined_model_names}.#{lookup_action}.#{reflection_or_attribute_name}"
lookups << :"#{joined_model_names}.#{lookup_action}.#{reflection_or_attribute_name}_html"
lookups << :"#{joined_model_names}.#{reflection_or_attribute_name}"
lookups << :"#{joined_model_names}.#{reflection_or_attribute_name}_html"
end
lookups << :"defaults.#{lookup_action}.#{reflection_or_attribute_name}"
lookups << :"defaults.#{lookup_action}.#{reflection_or_attribute_name}_html"
lookups << :"defaults.#{reflection_or_attribute_name}"
lookups << :"defaults.#{reflection_or_attribute_name}_html"
lookups << default
t(lookups.shift, scope: :"#{i18n_scope}.#{namespace}", default: lookups).presence

9
test/inputs/string_input_test.rb
View file

@ -115,15 +115,6 @@ class StringInputTest < ActionView::TestCase
end
end
test 'input translates a key prefixed with _html and return the html markup' do
store_translations(:en, simple_form: { labels: { user: {
name_html: '<b>Name</b>'
} } }) do
with_input_for @user, :name, :string
assert_select 'label b', 'Name'
end
end
[:email, :url, :search, :tel].each do |type|
test "input allows type #{type}" do
with_input_for @user, :name, type