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

diff --git a/config/application.rb b/config/application.rb
index 326a0ec8cacc17d04923210d1ab8d2b4e57dcfbb..385bd47046d19288ab7fda055c74423a1c9331ea 100644 (file)
--- 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
index 3136a40fc3ec5c903f74d63903d3b90be3df8195..f372cd36307f1f13ad09cd64c5619a56483d50f6 100644 (file)
--- 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