diff options
| author | Rafael França <rafaelmfranca@gmail.com> | 2018-09-06 14:38:26 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-06 14:38:26 -0400 |
| commit | 62a0c307545d6caa27b7e102bc193c6c117351c6 (patch) | |
| tree | 1f795cfc6f1b6e390065a8a263ac8e348daae7f6 | |
| parent | 2de047dbeb88215e1b5b86c1154e7d0f3002f9ba (diff) | |
| parent | 66614f6b67402ec526a699760d1c21c586834da8 (diff) | |
| download | rails-62a0c307545d6caa27b7e102bc193c6c117351c6.tar.gz rails-62a0c307545d6caa27b7e102bc193c6c117351c6.tar.bz2 rails-62a0c307545d6caa27b7e102bc193c6c117351c6.zip | |
Merge pull request #33574 from lsylvester/change-i18n-defaults-behaviour-to-match-i18n-1.1.0
update I18n fallbacks configuration to be compatible with i18n 1.1.0
| -rw-r--r-- | Gemfile | 1 | ||||
| -rw-r--r-- | Gemfile.lock | 3 | ||||
| -rw-r--r-- | activesupport/lib/active_support/i18n_railtie.rb | 14 |
3 files changed, 14 insertions, 4 deletions
@@ -45,7 +45,6 @@ gem "dalli" gem "listen", ">= 3.0.5", "< 3.2", require: false gem "libxml-ruby", platforms: :ruby gem "connection_pool", require: false -gem "i18n", "~> 1.0.1" # for railties app_generator_test gem "bootsnap", ">= 1.1.0", require: false diff --git a/Gemfile.lock b/Gemfile.lock index 50b93abae0..52cde3841a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -274,7 +274,7 @@ GEM hiredis (0.6.1-java) http_parser.rb (0.6.0) httpclient (2.8.3) - i18n (1.0.1) + i18n (1.1.0) concurrent-ruby (~> 1.0) image_processing (1.6.0) mini_magick (~> 4.0) @@ -525,7 +525,6 @@ DEPENDENCIES delayed_job_active_record google-cloud-storage (~> 1.11) hiredis - i18n (~> 1.0.1) image_processing (~> 1.2) json (>= 2.0.0) kindlerb (~> 1.2.0) diff --git a/activesupport/lib/active_support/i18n_railtie.rb b/activesupport/lib/active_support/i18n_railtie.rb index 93bde57f6a..c07eb5b569 100644 --- a/activesupport/lib/active_support/i18n_railtie.rb +++ b/activesupport/lib/active_support/i18n_railtie.rb @@ -87,9 +87,21 @@ module I18n when Hash, Array Array.wrap(fallbacks) else # TrueClass - [] + [I18n.default_locale] end + if args.empty? || args.first.is_a?(Hash) + 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 + explicitly configure it with `config.i18n.fallbacks.defaults = + [I18n.default_locale]` or `config.i18n.fallbacks = [I18n.default_locale, + {...}]` + MSG + args.unshift I18n.default_locale + end + I18n.fallbacks = I18n::Locale::Fallbacks.new(*args) end |