From 8d2f3179e6f312b34a2bacf36bc74f9c24e751bd Mon Sep 17 00:00:00 2001 From: Martin Larochelle Date: Thu, 16 Aug 2018 11:07:56 -0400 Subject: [PATCH] Call human_attribute_name with a string instead of a symbole --- activemodel/lib/active_model/errors.rb | 2 +- activemodel/test/cases/validations/i18n_validation_test.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/activemodel/lib/active_model/errors.rb b/activemodel/lib/active_model/errors.rb index 5138a07b71..af94d52d45 100644 --- a/activemodel/lib/active_model/errors.rb +++ b/activemodel/lib/active_model/errors.rb @@ -413,7 +413,7 @@ module ActiveModel defaults << "%{attribute} %{message}" attr_name = attribute.tr(".", "_").humanize - attr_name = @base.class.human_attribute_name(attribute.to_sym, default: attr_name) + attr_name = @base.class.human_attribute_name(attribute, default: attr_name) I18n.t(defaults.shift, default: defaults, diff --git a/activemodel/test/cases/validations/i18n_validation_test.rb b/activemodel/test/cases/validations/i18n_validation_test.rb index 3e135e6f8e..ccb565c5bd 100644 --- a/activemodel/test/cases/validations/i18n_validation_test.rb +++ b/activemodel/test/cases/validations/i18n_validation_test.rb @@ -35,7 +35,7 @@ class I18nValidationTest < ActiveModel::TestCase def test_errors_full_messages_translates_human_attribute_name_for_model_attributes @person.errors.add(:name, "not found") - assert_called_with(Person, :human_attribute_name, [:name, default: "Name"], returns: "Person's name") do + assert_called_with(Person, :human_attribute_name, ["name", default: "Name"], returns: "Person's name") do assert_equal ["Person's name not found"], @person.errors.full_messages end end