diff options
| author | Matt Jankowski <mjankowski@thoughtbot.com> | 2017-04-14 19:12:39 -0400 |
|---|---|---|
| committer | Eugen <eugen@zeonfederated.com> | 2017-04-15 01:12:39 +0200 |
| commit | f5cd1383231af6922dbab4f54b7d29eacfec9d9e (patch) | |
| tree | b5fc3c714c4f29dcba644d596495a531c4abb467 /app/controllers/concerns | |
| parent | 66ea015a017d97ecbd18eb850a033ca0c32e7957 (diff) | |
Improve i18n chooser (#1804)
* Add locale spec with failing locale plus region check * Use a more accurate locale when supplied by browser headers Previously we were using a matching option which would use the first locale available which matched the locale portion, even if a region was specified. This changes to first try to find an exact match, and then fall back to the region, and then fall back to the default. * Clean up default_locale method
Diffstat (limited to 'app/controllers/concerns')
| -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 22bb5b21a..d9a7a7227 100644 --- a/app/controllers/concerns/localized.rb +++ b/app/controllers/concerns/localized.rb @@ -27,7 +27,11 @@ module Localized def default_locale ENV.fetch('DEFAULT_LOCALE') { - http_accept_language.compatible_language_from(I18n.available_locales) || I18n.default_locale + user_supplied_locale || I18n.default_locale } end + + def user_supplied_locale + http_accept_language.language_region_compatible_from(I18n.available_locales) + end end |