Fix compatible_language_from in the http_accept_language plugin to

correctly follow the RFC 2616 language selection algorithm and then
revert to the previous way of selecting languages.

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 00104b0a174d618292cf0958c0d4c00c693e7c5a..0d6cdea6424fea77b93e32e047796546008a1637 100644 (file)
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -110,9 +110,8 @@ class ApplicationController < ActionController::Base
       end
     end
 
       end
     end
 

-    I18n.locale = request.preferred_language_from(I18n.available_locales) ||
-                  request.compatible_language_from(I18n.available_locales)
-    logger.info("Select #{I18n.locale} matching #{request.user_preferred_languages.join(',')} against #{I18n.available_locales.join(',')}")
+    I18n.locale = request.compatible_language_from(I18n.available_locales)
+

     response.headers['Content-Language'] = I18n.locale.to_s
   end
 
     response.headers['Content-Language'] = I18n.locale.to_s
   end
 

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 85ee89c95d8885f80bff36be063efd4d429b8a9e..1bedd6c742ff28e9793576688bd8a05aefe15185 100644 (file)
--- a/vendor/plugins/http_accept_language/lib/http_accept_language.rb
+++ b/vendor/plugins/http_accept_language/lib/http_accept_language.rb
@@ -48,9 +48,8 @@ module HttpAcceptLanguage
   #
   def compatible_language_from(array)
     user_preferred_languages.map do |x|
   #
   def compatible_language_from(array)
     user_preferred_languages.map do |x|

-      x = x.to_s.split("-")[0]

       array.find do |y|
       array.find do |y|

-        y.to_s.split("-")[0] == x
+        y.to_s =~ /^#{x.to_s}(-|$)/

       end
     end.compact.first
   end
       end
     end.compact.first
   end