Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master

2018-03-20 19:17:20 +00:00
parent 2649cce3a0 ac49c7932d
commit e8aeec4fea
8 changed files with 79 additions and 46 deletions
--- 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