Unfloyded/Legamunt
0
0
Fork 0
Code Activity

Fix sr locale being selected over sr-Latn (#13693)

Browse source 
* Fix sr locale being selected over sr-Latn

* Update tests
This commit is contained in:
ThibG 2020-05-11 01:09:21 +02:00 • committed by GitHub
parent 4b2d9b8a55
commit 4bcef12bad
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

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

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