mirror/whippy-edition
1
0
Fork 0
mirror of https://github.com/whippyshou/mastodon synced 2024-11-25 07:37:08 +09:00
Code

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

Browse Source 
Fix #6784
This commit is contained in:
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

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

@ -17,7 +17,11 @@ module Localized
end
def default_locale
request_locale || I18n.default_locale
if ENV['DEFAULT_LOCALE'].present?
I18n.default_locale
else
request_locale || I18n.default_locale
end
end
def request_locale