Merge branch 'master' into HEAD

[rails.git] / config / initializers / http_accept_language.rb

diff --git a/config/initializers/http_accept_language.rb b/config/initializers/http_accept_language.rb
deleted file mode 100644 (file)
index 04c3dfa..0000000
--- a/config/initializers/http_accept_language.rb
+++ /dev/null
@@ -1,12 +0,0 @@
-#
-# Monkey patch HttpAcceptLanguage pending integration of
-# https://github.com/iain/http_accept_language/pull/6
-#
-module HttpAcceptLanguage
-  def compatible_language_from(available_languages)
-    user_preferred_languages.find do |x|
-      available_languages.find { |y| y.to_s == x.to_s } ||
-      available_languages.find { |y| y.to_s =~ /^#{Regexp.escape(x.to_s)}-/ }
-    end
-  end
-end