tarrien/Mastodon
1
0 Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Jenkins committed 2018-03-20 19:17:20 +00:00
2 parents 2649cce3a0 ac49c7932d
commit e8aeec4fea
8 files changed
+79 -46
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

config/application.rb
+1 -3
View File
@@ -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