diff options
| author | Jenkins <jenkins@jenkins.ninjawedding.org> | 2018-03-18 16:17:15 +0000 |
|---|---|---|
| committer | Jenkins <jenkins@jenkins.ninjawedding.org> | 2018-03-18 16:17:15 +0000 |
| commit | f2a9a13b321560828b74a32abbf597727b095f0d (patch) | |
| tree | e7ee430f348641f7045bc2804c01b3a871d81b04 /app/controllers | |
| parent | 9341b982b611ed3655489a01ba32720b84dfefdc (diff) | |
| parent | 39f27b6cf3868806fc3a35003f8600f60795d737 (diff) | |
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
Diffstat (limited to 'app/controllers')
| -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 |