mirror of
https://github.com/rails/rails.git
synced 2022-11-09 12:12:34 -05:00
Object names with underscore do the wrong lookup in I18n on error_messages_for.
Signed-off-by: Michael Koziarski <michael@koziarski.com> [#2390 state:committed]
This commit is contained in:
parent
42cdc7571d
commit
1ab7c37671
2 changed files with 7 additions and 4 deletions
|
@ -194,7 +194,7 @@ module ActionView
|
||||||
options[:header_message]
|
options[:header_message]
|
||||||
else
|
else
|
||||||
object_name = options[:object_name].to_s.gsub('_', ' ')
|
object_name = options[:object_name].to_s.gsub('_', ' ')
|
||||||
object_name = I18n.t(object_name, :default => object_name, :scope => [:activerecord, :models], :count => 1)
|
object_name = I18n.t(options[:object_name].to_s, :default => object_name, :scope => [:activerecord, :models], :count => 1)
|
||||||
locale.t :header, :count => count, :model => object_name
|
locale.t :header, :count => count, :model => object_name
|
||||||
end
|
end
|
||||||
message = options.include?(:message) ? options[:message] : locale.t(:body)
|
message = options.include?(:message) ? options[:message] : locale.t(:body)
|
||||||
|
|
|
@ -4,9 +4,12 @@ class ActiveRecordHelperI18nTest < Test::Unit::TestCase
|
||||||
include ActionView::Helpers::ActiveRecordHelper
|
include ActionView::Helpers::ActiveRecordHelper
|
||||||
|
|
||||||
attr_reader :request
|
attr_reader :request
|
||||||
|
|
||||||
def setup
|
def setup
|
||||||
@object = stub :errors => stub(:count => 1, :full_messages => ['full_messages'])
|
@object = stub :errors => stub(:count => 1, :full_messages => ['full_messages'])
|
||||||
@object_name = 'book'
|
@object_name = 'book_seller'
|
||||||
|
@object_name_without_underscore = 'book seller'
|
||||||
|
|
||||||
stubs(:content_tag).returns 'content_tag'
|
stubs(:content_tag).returns 'content_tag'
|
||||||
|
|
||||||
I18n.stubs(:t).with(:'header', :locale => 'en', :scope => [:activerecord, :errors, :template], :count => 1, :model => '').returns "1 error prohibited this from being saved"
|
I18n.stubs(:t).with(:'header', :locale => 'en', :scope => [:activerecord, :errors, :template], :count => 1, :model => '').returns "1 error prohibited this from being saved"
|
||||||
|
@ -37,8 +40,8 @@ class ActiveRecordHelperI18nTest < Test::Unit::TestCase
|
||||||
end
|
end
|
||||||
|
|
||||||
def test_error_messages_for_given_object_name_it_translates_object_name
|
def test_error_messages_for_given_object_name_it_translates_object_name
|
||||||
I18n.expects(:t).with(:header, :locale => 'en', :scope => [:activerecord, :errors, :template], :count => 1, :model => @object_name).returns "1 error prohibited this #{@object_name} from being saved"
|
I18n.expects(:t).with(:header, :locale => 'en', :scope => [:activerecord, :errors, :template], :count => 1, :model => @object_name_without_underscore).returns "1 error prohibited this #{@object_name_without_underscore} from being saved"
|
||||||
I18n.expects(:t).with(@object_name, :default => @object_name, :count => 1, :scope => [:activerecord, :models]).once.returns @object_name
|
I18n.expects(:t).with(@object_name, :default => @object_name_without_underscore, :count => 1, :scope => [:activerecord, :models]).once.returns @object_name_without_underscore
|
||||||
error_messages_for(:object => @object, :locale => 'en', :object_name => @object_name)
|
error_messages_for(:object => @object, :locale => 'en', :object_name => @object_name)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in a new issue