kotovalexarian-likes-github/mperham--sidekiq
1
0
Fork 0
mirror of https://github.com/mperham/sidekiq.git synced 2022-11-09 13:52:34 -05:00
Code Releases Activity

Further tweaks for locale determination, fixes #2353

Browse source
This commit is contained in:
Mike Perham 2015-05-15 12:02:57 -07:00
parent edd389d095
commit 5e1379087c
2 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
lib/sidekiq/web_helpers.rb
View file

@ -65,6 +65,7 @@ module Sidekiq
locale = 'en'.freeze
languages = request.env['HTTP_ACCEPT_LANGUAGE'.freeze] || 'en'.freeze
languages.downcase.split(','.freeze).each do |lang|
next if lang == '*'
lang = lang.split(';'.freeze)[0]
break locale = lang if find_locale_files(lang).any?
end

6
test/test_web_helpers.rb
View file

@ -42,5 +42,11 @@ class TestWebHelpers < Sidekiq::Test
obj = Helpers.new('HTTP_ACCEPT_LANGUAGE' => 'zh-CN,zh;q=0.8,en-US;q=0.6,en;q=0.4,ru;q=0.2')
assert_equal 'zh-cn', obj.locale
obj = Helpers.new('HTTP_ACCEPT_LANGUAGE' => 'en-us; *')
assert_equal 'en', obj.locale
obj = Helpers.new('HTTP_ACCEPT_LANGUAGE' => '*')
assert_equal 'en', obj.locale
end
end