Unfloyded/Legamunt
0
0
Fork 0
Code Activity

Improve i18n chooser (#1804)

Browse source 
* 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
This commit is contained in:
Matt Jankowski 2017-04-14 19:12:39 -04:00 • committed by Eugen
parent 66ea015a01
commit f5cd138323
2 changed files with 36 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/controllers/concerns/localized.rb
View file

@ -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