tarrien/Mastodon
1
0 Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki 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 authored and GitHub committed 2020-05-11 01:09:21 +02:00
1 parent 4b2d9b8a55
commit 4bcef12bad
3 files changed
+10 -16
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

app/controllers/concerns/localized.rb
+1 -13
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