From 39f27b6cf3868806fc3a35003f8600f60795d737 Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Sun, 18 Mar 2018 16:57:04 +0100 Subject: [PATCH] If DEFAULT_LOCALE is set, enforce it instead of HTTP request locale (#6817) Fix #6784 --- app/controllers/concerns/localized.rb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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