about summary refs log tree commit diff
diff options
context:
space:
mode:
authorAkihiko Odaki <akihiko.odaki.4i@stu.hosei.ac.jp>2018-03-21 00:36:20 +0900
committerEugen Rochko <eugen@zeonfederated.com>2018-03-20 16:36:20 +0100
commit61dcb686a8f0a3272e2948c9a072aa58593a7409 (patch)
tree8505c48d35d3094068a14ef4776589625b358c5b
parent9381a7d9d55ea734d6c498a82d17d73fd02fbe87 (diff)
Fix i18n fallback configuration conflicts with environment configurations (#6843)
-rw-r--r--config/application.rb4
-rw-r--r--config/environments/production.rb4
2 files changed, 3 insertions, 5 deletions
diff --git a/config/application.rb b/config/application.rb
index 326a0ec8c..385bd4704 100644
--- 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 3136a40fc..f372cd363 100644
--- 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