X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/25d0017b18773458529275d2f60f2599ee03a633..a29c8f670d9773fa9b4633684977384e154cc900:/vendor/plugins/http_accept_language/lib/http_accept_language.rb

diff --git a/vendor/plugins/http_accept_language/lib/http_accept_language.rb b/vendor/plugins/http_accept_language/lib/http_accept_language.rb
index 1bedd6c74..0cc8a7719 100644
--- a/vendor/plugins/http_accept_language/lib/http_accept_language.rb
+++ b/vendor/plugins/http_accept_language/lib/http_accept_language.rb
@@ -47,11 +47,10 @@ module HttpAcceptLanguage
   #   request.compatible_language_from I18n.available_locales
   #
   def compatible_language_from(array)
-    user_preferred_languages.map do |x|
-      array.find do |y|
-        y.to_s =~ /^#{x.to_s}(-|$)/
-      end
-    end.compact.first
+    user_preferred_languages.find do |x|
+      array.find { |y| y.to_s == x.to_s } ||
+      array.find { |y| y.to_s =~ /^#{Regexp.escape(x.to_s)}-/ }
+    end
   end
 
 end