Unfloyded/Legamunt
0
0
Fork 0
Code Activity

Add global locale param (#17464)

Browse source 
- Remove the session-based locale stickyness
This commit is contained in:
Eugen Rochko 2022-02-08 02:34:56 +01:00 • committed by GitHub
parent 35850f8195
commit 85b86fe28c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

11
config/application.rb
View file

@ -149,10 +149,14 @@ module Mastodon
:'zh-TW',
]
config.i18n.default_locale = ENV['DEFAULT_LOCALE']&.to_sym
config.i18n.default_locale = begin
custom_default_locale = ENV['DEFAULT_LOCALE']&.to_sym
unless config.i18n.available_locales.include?(config.i18n.default_locale)
config.i18n.default_locale = :en
if config.i18n.available_locales.include?(custom_default_locale)
custom_default_locale
else
:en
end
end
# config.paths.add File.join('app', 'api'), glob: File.join('**', '*.rb')
@ -169,7 +173,6 @@ module Mastodon
Doorkeeper::Application.send :include, ApplicationExtension
Doorkeeper::AccessToken.send :include, AccessTokenExtension
Devise::FailureApp.send :include, AbstractController::Callbacks
Devise::FailureApp.send :include, HttpAcceptLanguage::EasyAccess
Devise::FailureApp.send :include, Localized
end
end