diff options
| author | Starfall <admin@plural.cafe> | 2020-05-15 18:30:58 -0500 |
|---|---|---|
| committer | Starfall <admin@plural.cafe> | 2020-05-15 18:30:58 -0500 |
| commit | 3f6370500cd8bf04fab9c9d8f3099271126a3097 (patch) | |
| tree | 7215e9562c06435f9e6464fee2aa0185dd108a34 /app/controllers/concerns | |
| parent | ca3af6c5b00be851e2ced9112429cfc1baa79529 (diff) | |
| parent | b7e178d2e4102bdaa1ea41dfd8ed50093cf3f60a (diff) | |
Update to Mastodon 3.1.4 / Merge branch 'glitch'
Diffstat (limited to 'app/controllers/concerns')
| -rw-r--r-- | app/controllers/concerns/localized.rb | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/app/controllers/concerns/localized.rb b/app/controllers/concerns/localized.rb index b43859d9d..d1384ed56 100644 --- a/app/controllers/concerns/localized.rb +++ b/app/controllers/concerns/localized.rb @@ -28,18 +28,6 @@ module Localized end def request_locale - preferred_locale || compatible_locale - end - - def preferred_locale - http_accept_language.preferred_language_from(available_locales) - end - - def compatible_locale - http_accept_language.compatible_language_from(available_locales) - end - - def available_locales - I18n.available_locales.reverse + http_accept_language.language_region_compatible_from(I18n.available_locales) end end |