diff options
| author | David Yip <yipdw@member.fsf.org> | 2018-03-18 20:20:08 -0500 |
|---|---|---|
| committer | David Yip <yipdw@member.fsf.org> | 2018-03-18 20:20:08 -0500 |
| commit | 6a6f680d98d114e3bb26e414ad7e3787a62bd129 (patch) | |
| tree | 002f07d5d5c666c7b5ce47940438e846210f2f5b /app/controllers/concerns/localized.rb | |
| parent | a387f99659e9a1dde11b6a8f6f3dd5a433b55f45 (diff) | |
| parent | f2a9a13b321560828b74a32abbf597727b095f0d (diff) | |
Merge remote-tracking branch 'personal/merge/tootsuite/master' into gs-master
Diffstat (limited to 'app/controllers/concerns/localized.rb')
| -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 |