Escape language codes before matching them in case they contain

[rails.git] / 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 f181c9f4309287d6aac017cdf9723ac7415aa0f6..1266a3e645560b26bec1f3a7faba4f5479dddf21 100644 (file)
--- a/vendor/plugins/http_accept_language/lib/http_accept_language.rb
+++ b/vendor/plugins/http_accept_language/lib/http_accept_language.rb
@@ -25,7 +25,7 @@ module HttpAcceptLanguage
   # Sets the user languages preference, overiding the browser
   #
   def user_preferred_languages=(languages)
-    @user_preferred_languages = languages.join(",")
+    @user_preferred_languages = languages
   end
 
   # Finds the locale specifically requested by the browser.
@@ -48,9 +48,8 @@ module HttpAcceptLanguage
   #
   def compatible_language_from(array)
     user_preferred_languages.map do |x|
-      x = x.to_s.split("-")[0]
       array.find do |y|
-        y.to_s.split("-")[0] == x
+        y.to_s =~ /^#{Regexp.escape(x.to_s)}(-|$)/
       end
     end.compact.first
   end