Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master

2018-03-18 16:17:15 +00:00
parent 9341b982b6 39f27b6cf3
commit f2a9a13b32
3 changed files with 31 additions and 7 deletions
--- 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