autonomic-cooperative/hometown
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Akihiko Odaki
2018-03-21 00:36:20 +09:00
committed by Eugen Rochko
parent 9381a7d9d5
commit 61dcb686a8
2 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
config/application.rb
View File

@ -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