From 61dcb686a8f0a3272e2948c9a072aa58593a7409 Mon Sep 17 00:00:00 2001 From: Akihiko Odaki Date: Wed, 21 Mar 2018 00:36:20 +0900 Subject: Fix i18n fallback configuration conflicts with environment configurations (#6843) --- config/application.rb | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'config/application.rb') diff --git a/config/application.rb b/config/application.rb index 326a0ec8cac..385bd47046d 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 -- cgit v1.2.3