You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
38 lines
1.5 KiB
38 lines
1.5 KiB
From 66614f6b67402ec526a699760d1c21c586834da8 Mon Sep 17 00:00:00 2001
|
|
From: Lachlan Sylvester <lachlan.sylvester@publicisfrontfoot.com.au>
|
|
Date: Fri, 10 Aug 2018 14:28:40 +1000
|
|
Subject: [PATCH] update I18n fallbacks configuration to be compatible with
|
|
i18n 1.1.0
|
|
|
|
---
|
|
activesupport/lib/active_support/i18n_railtie.rb | 14 +++++++++++++-
|
|
1 files changed, 13 insertions(+), 1 deletions(-)
|
|
|
|
diff --git a/activesupport/lib/active_support/i18n_railtie.rb b/activesupport/lib/active_support/i18n_railtie.rb
|
|
index 93bde57f6aa6..c07eb5b56986 100644
|
|
--- a/activesupport/lib/active_support/i18n_railtie.rb
|
|
+++ b/activesupport/lib/active_support/i18n_railtie.rb
|
|
@@ -88,9 +88,21 @@ def self.init_fallbacks(fallbacks)
|
|
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
|
|
|