hamptonmoore
/
mastodon
forked from treehouse/mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

If DEFAULT_LOCALE is set, enforce it instead of HTTP request locale (#6817) 

Fix #6784
signup-info-prompt
Eugen Rochko 2018-03-18 16:57:04 +01:00 committed by GitHub
parent 721234230c
commit 39f27b6cf3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/controllers/concerns/localized.rb
View File

@ -17,8 +17,12 @@ module Localized
end end
def default_locale def default_locale
if ENV['DEFAULT_LOCALE'].present?
I18n.default_locale
else
request_locale || I18n.default_locale request_locale || I18n.default_locale
end end
end
def request_locale def request_locale
preferred_locale || compatible_locale preferred_locale || compatible_locale