Further tweaks for locale determination, fixes sidekiq#2353

IFTTT · May 15, 2015 · 5e13790 · 5e13790
1 parent edd389d
commit 5e13790
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/lib/sidekiq/web_helpers.rb b/lib/sidekiq/web_helpers.rb
@@ -65,6 +65,7 @@ def locale
         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

diff --git a/test/test_web_helpers.rb b/test/test_web_helpers.rb
@@ -42,5 +42,11 @@ def test_locale_determination
 
     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