aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael França <rafaelmfranca@gmail.com>2018-09-06 15:50:21 -0400
committerGitHub <noreply@github.com>2018-09-06 15:50:21 -0400
commit29f5f702f91fd1ddb51db87a10cfc5982f58d2fa (patch)
treec32f4674d3d83a43b4507cf29745eafe69eafc74
parentabfc1db01f2e16fe54e5a747162f01ed5704e961 (diff)
parent70e3d1ea9d22c23f3d60fd1b5afad2a288a14221 (diff)
downloadrails-29f5f702f91fd1ddb51db87a10cfc5982f58d2fa.tar.gz
rails-29f5f702f91fd1ddb51db87a10cfc5982f58d2fa.tar.bz2
rails-29f5f702f91fd1ddb51db87a10cfc5982f58d2fa.zip
Merge pull request #33807 from olimart/patch-4
Fix typo in i18n_railtie.rb [ci skip]
-rw-r--r--activesupport/lib/active_support/i18n_railtie.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activesupport/lib/active_support/i18n_railtie.rb b/activesupport/lib/active_support/i18n_railtie.rb
index c07eb5b569..584930e413 100644
--- a/activesupport/lib/active_support/i18n_railtie.rb
+++ b/activesupport/lib/active_support/i18n_railtie.rb
@@ -94,7 +94,7 @@ module I18n
ActiveSupport::Deprecation.warn(<<-MSG.squish)
Using I18n fallbacks with an empty `defaults` sets the defaults to
include the `default_locale`. This behavior will change in Rails 6.1.
- If you desire the default local to be included in the defaults, please
+ 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,
{...}]`