diff options
| author | Jenkins <jenkins@jenkins.ninjawedding.org> | 2018-03-20 19:17:20 +0000 |
|---|---|---|
| committer | Jenkins <jenkins@jenkins.ninjawedding.org> | 2018-03-20 19:17:20 +0000 |
| commit | e8aeec4fead8810ee2efcdb2b0198941dfb168ee (patch) | |
| tree | 887c56068d4d89f44c3348b999b353e1b1bc12bf /config/application.rb | |
| parent | 2649cce3a065f3825d63b7f7be341787aa1d2f9a (diff) | |
| parent | ac49c7932d848fbb946c37a69f42b7dbc774c56c (diff) | |
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
Diffstat (limited to 'config/application.rb')
| -rw-r--r-- | config/application.rb | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/config/application.rb b/config/application.rb index 4319167dc..c0899ad70 100644 --- a/config/application.rb +++ b/config/application.rb @@ -77,9 +77,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 |