mastofe

commit: 61dcb686a8f0a3272e2948c9a072aa58593a7409
parent: 9381a7d9d55ea734d6c498a82d17d73fd02fbe87
Author: Akihiko Odaki <akihiko.odaki.4i@stu.hosei.ac.jp>
Date:   Wed, 21 Mar 2018 00:36:20 +0900

Fix i18n fallback configuration conflicts with environment configurations (#6843)


Diffstat:
M
config/application.rb
4
+---
M
config/environments/production.rb
4
++--

2 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/config/application.rb b/config/application.rb
@@ -76,9 +76,7 @@ module Mastodon
     ]
 
     config.i18n.default_locale = ENV['DEFAULT_LOCALE']&.to_sym
-    if config.i18n.available_locales.include?(config.i18n.default_locale)
-      config.i18n.fallbacks = [:en]
-    else
+    unless config.i18n.available_locales.include?(config.i18n.default_locale)
       config.i18n.default_locale = :en
     end
 
diff --git a/config/environments/production.rb b/config/environments/production.rb
@@ -55,8 +55,8 @@ Rails.application.configure do
   # config.action_mailer.raise_delivery_errors = false
 
   # Enable locale fallbacks for I18n (makes lookups for any locale fall back to
-  # the I18n.default_locale when a translation cannot be found).
-  config.i18n.fallbacks = true
+  # English when a translation cannot be found).
+  config.i18n.fallbacks = [:en]
 
   # Send deprecation notices to registered listeners.
   config.active_support.deprecation = :notify