diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-10-09 13:18:59 -0300 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-10-09 13:18:59 -0300 |
| commit | e3207bdbba55f3806441f22b175557579bc0b051 (patch) | |
| tree | 199e9ba62481118e17a3f139155eaa4f470a6c22 /actionpack/lib/action_dispatch | |
| parent | 344ec1b6a7ed102ce6a92c31e3b64364f4bdb772 (diff) | |
| parent | e86cadc257caf6dcd762810f022e5d4009c6ca25 (diff) | |
| download | rails-e3207bdbba55f3806441f22b175557579bc0b051.tar.gz rails-e3207bdbba55f3806441f22b175557579bc0b051.tar.bz2 rails-e3207bdbba55f3806441f22b175557579bc0b051.zip | |
Merge pull request #17221 from StefanH/fix-unknown-http-method-message
Invalid HTTP method will raise I18n::InvalidLocale if :en is not a valid locale.
Diffstat (limited to 'actionpack/lib/action_dispatch')
| -rw-r--r-- | actionpack/lib/action_dispatch/http/request.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_dispatch/http/request.rb b/actionpack/lib/action_dispatch/http/request.rb index e854dd266c..a8785ee6bf 100644 --- a/actionpack/lib/action_dispatch/http/request.rb +++ b/actionpack/lib/action_dispatch/http/request.rb @@ -341,7 +341,7 @@ module ActionDispatch private def check_method(name) - HTTP_METHOD_LOOKUP[name] || raise(ActionController::UnknownHttpMethod, "#{name}, accepted HTTP methods are #{HTTP_METHODS.to_sentence(:locale => :en)}") + HTTP_METHOD_LOOKUP[name] || raise(ActionController::UnknownHttpMethod, "#{name}, accepted HTTP methods are #{HTTP_METHODS[0...-1].join(', ')}, and #{HTTP_METHODS[-1]}") name end end |