diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2018-03-18 16:57:04 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-18 16:57:04 +0100 |
| commit | 39f27b6cf3868806fc3a35003f8600f60795d737 (patch) | |
| tree | ec5da62b396034492a0cf0935aa4d2173df7b7c6 /app | |
| parent | 721234230c8eb4bc0d1388276e59350103c01577 (diff) | |
If DEFAULT_LOCALE is set, enforce it instead of HTTP request locale (#6817)
Fix #6784
Diffstat (limited to 'app')
| -rw-r--r-- | app/controllers/concerns/localized.rb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/app/controllers/concerns/localized.rb b/app/controllers/concerns/localized.rb index e697284a8..abd85ea27 100644 --- a/app/controllers/concerns/localized.rb +++ b/app/controllers/concerns/localized.rb @@ -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 |