From: Tom Hughes Date: Sat, 24 Sep 2011 17:06:23 +0000 (+0100) Subject: Make http_accept_language work with rails 3.1.0 X-Git-Tag: live~6067 X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/8d520578a1e7b62bc2796f7c527c621e1b3c87cb Make http_accept_language work with rails 3.1.0 --- diff --git a/vendor/plugins/http_accept_language/init.rb b/vendor/plugins/http_accept_language/init.rb index 67e2687e3..050a7ca56 100644 --- a/vendor/plugins/http_accept_language/init.rb +++ b/vendor/plugins/http_accept_language/init.rb @@ -1,4 +1,6 @@ -if defined?(ActionController::Request) +if defined?(ActionDispatch::Request) + ActionDispatch::Request.send :include, HttpAcceptLanguage +elsif defined?(ActionController::Request) ActionController::Request.send :include, HttpAcceptLanguage elsif defined?(ActionController::AbstractRequest) ActionController::AbstractRequest.send :include, HttpAcceptLanguage