From: Eugen Rochko <eugen@zeonfederated.com>
Date: Sun, 18 Mar 2018 15:57:04 +0000 (+0100)
Subject: If DEFAULT_LOCALE is set, enforce it instead of HTTP request locale (#6817)
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=39f27b6cf3868806fc3a35003f8600f60795d737;p=mastodon.git

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

Fix #6784
---

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