mirror of
https://github.com/mastodon/mastodon.git
synced 2024-12-23 01:25:36 +00:00
* Fix #2195 - Set locale to error pages * Fix #2195 - Cut duplicate process into one method
This commit is contained in:
parent
27a99b19e8
commit
5e33ad29d4
|
@ -53,21 +53,21 @@ class ApplicationController < ActionController::Base
|
|||
def not_found
|
||||
respond_to do |format|
|
||||
format.any { head 404 }
|
||||
format.html { render 'errors/404', layout: 'error', status: 404 }
|
||||
format.html { respond_with_error(404) }
|
||||
end
|
||||
end
|
||||
|
||||
def gone
|
||||
respond_to do |format|
|
||||
format.any { head 410 }
|
||||
format.html { render 'errors/410', layout: 'error', status: 410 }
|
||||
format.html { respond_with_error(410) }
|
||||
end
|
||||
end
|
||||
|
||||
def unprocessable_entity
|
||||
respond_to do |format|
|
||||
format.any { head 422 }
|
||||
format.html { render 'errors/422', layout: 'error', status: 422 }
|
||||
format.html { respond_with_error(422) }
|
||||
end
|
||||
end
|
||||
|
||||
|
@ -102,4 +102,10 @@ class ApplicationController < ActionController::Base
|
|||
|
||||
raw.map { |item| cached_keys_with_value[item.cache_key] || uncached[item.id] }.compact
|
||||
end
|
||||
|
||||
def respond_with_error(code)
|
||||
set_locale do
|
||||
render "errors/#{code}", layout: 'error', status: code
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
Loading…
Reference in a new issue