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

Fix #6784
2018-03-18 16:57:04 +01:00 · 2018-03-18 16:57:04 +01:00 · 39f27b6cf3
commit 39f27b6cf3
parent 721234230c
1 changed files with 5 additions and 1 deletions
--- a/app/controllers/concerns/localized.rb
+++ b/app/controllers/concerns/localized.rb
@ -17,8 +17,12 @@ module Localized
  end

  def default_locale
+    if ENV['DEFAULT_LOCALE'].present?
+      I18n.default_locale
+    else
      request_locale || I18n.default_locale
    end
+  end

  def request_locale
    preferred_locale || compatible_locale