diff options
author | Rafael França <rafaelmfranca@gmail.com> | 2019-03-29 13:27:42 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-03-29 13:27:42 -0400 |
commit | 8638c7a643cde203114af479bafddb357ece0fb9 (patch) | |
tree | 2c67c8e839706ab5f5566be5d3a5f786bcbe2332 /activemodel/lib/active_model | |
parent | 7e45911a34f96864267d686c393315279af2c985 (diff) | |
parent | d8ba2f7c5670f5b2ef1486c9a3fb3e69fc514989 (diff) | |
download | rails-8638c7a643cde203114af479bafddb357ece0fb9.tar.gz rails-8638c7a643cde203114af479bafddb357ece0fb9.tar.bz2 rails-8638c7a643cde203114af479bafddb357ece0fb9.zip |
Merge pull request #35789 from prathamesh-sonpatki/customize-full-message
Rename `i18n_full_message` config option to `i18n_customize_full_message`
Diffstat (limited to 'activemodel/lib/active_model')
-rw-r--r-- | activemodel/lib/active_model/errors.rb | 6 | ||||
-rw-r--r-- | activemodel/lib/active_model/railtie.rb | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/activemodel/lib/active_model/errors.rb b/activemodel/lib/active_model/errors.rb index d7e682d406..3a692a3e64 100644 --- a/activemodel/lib/active_model/errors.rb +++ b/activemodel/lib/active_model/errors.rb @@ -63,9 +63,9 @@ module ActiveModel MESSAGE_OPTIONS = [:message] class << self - attr_accessor :i18n_full_message # :nodoc: + attr_accessor :i18n_customize_full_message # :nodoc: end - self.i18n_full_message = false + self.i18n_customize_full_message = false attr_reader :messages, :details @@ -413,7 +413,7 @@ module ActiveModel return message if attribute == :base attribute = attribute.to_s - if self.class.i18n_full_message && @base.class.respond_to?(:i18n_scope) + if self.class.i18n_customize_full_message && @base.class.respond_to?(:i18n_scope) attribute = attribute.remove(/\[\d\]/) parts = attribute.split(".") attribute_name = parts.pop diff --git a/activemodel/lib/active_model/railtie.rb b/activemodel/lib/active_model/railtie.rb index 0ed70bd473..eb7901c7e9 100644 --- a/activemodel/lib/active_model/railtie.rb +++ b/activemodel/lib/active_model/railtie.rb @@ -13,8 +13,8 @@ module ActiveModel ActiveModel::SecurePassword.min_cost = Rails.env.test? end - initializer "active_model.i18n_full_message" do - ActiveModel::Errors.i18n_full_message = config.active_model.delete(:i18n_full_message) || false + initializer "active_model.i18n_customize_full_message" do + ActiveModel::Errors.i18n_customize_full_message = config.active_model.delete(:i18n_customize_full_message) || false end end end |