aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKasper Timm Hansen <kaspth@gmail.com>2019-04-17 20:24:33 +0200
committerGitHub <noreply@github.com>2019-04-17 20:24:33 +0200
commit7230447d5a712017f2d51abeff035465c261c943 (patch)
tree00197751864dc99a730b90488523a133448b9781
parent6adab7a34d1f3293c426a18393d96a02546c052f (diff)
parentd611a3d661c6323b5be1f9a9a8c51681bf04013c (diff)
downloadrails-7230447d5a712017f2d51abeff035465c261c943.tar.gz
rails-7230447d5a712017f2d51abeff035465c261c943.tar.bz2
rails-7230447d5a712017f2d51abeff035465c261c943.zip
Merge pull request #35052 from schuetzm/silence-i18n-fallback-deprecation
Describe how to silence the deprecation warning about empty I18n fall…
-rw-r--r--activesupport/lib/active_support/i18n_railtie.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/activesupport/lib/active_support/i18n_railtie.rb b/activesupport/lib/active_support/i18n_railtie.rb
index 584930e413..8faa93a3e4 100644
--- a/activesupport/lib/active_support/i18n_railtie.rb
+++ b/activesupport/lib/active_support/i18n_railtie.rb
@@ -97,7 +97,8 @@ module I18n
If you desire the default locale to be included in the defaults, please
explicitly configure it with `config.i18n.fallbacks.defaults =
[I18n.default_locale]` or `config.i18n.fallbacks = [I18n.default_locale,
- {...}]`
+ {...}]`. If you want to opt-in to the new behavior, use
+ `config.i18n.fallbacks.defaults = [nil, {...}]`.
MSG
args.unshift I18n.default_locale
end