nrd.li/mastodon
Archived
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fix #2195 - Set locale to error pages (#2255)

Browse source 
* Fix #2195 - Set locale to error pages

* Fix #2195 - Cut duplicate process into one method
This commit is contained in:
Takayoshi Nishida 2017-04-21 23:11:20 +07:00 committed by Eugen
parent 27a99b19e8
commit 5e33ad29d4
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
app/controllers/application_controller.rb
View file

@ -53,21 +53,21 @@ class ApplicationController < ActionController::Base
def not_found def not_found
respond_to do |format| respond_to do |format|
format.any { head 404 } format.any { head 404 }
format.html { render 'errors/404', layout: 'error', status: 404 } format.html { respond_with_error(404) }
end end
end end
def gone def gone
respond_to do |format| respond_to do |format|
format.any { head 410 } format.any { head 410 }
format.html { render 'errors/410', layout: 'error', status: 410 } format.html { respond_with_error(410) }
end end
end end
def unprocessable_entity def unprocessable_entity
respond_to do |format| respond_to do |format|
format.any { head 422 } format.any { head 422 }
format.html { render 'errors/422', layout: 'error', status: 422 } format.html { respond_with_error(422) }
end end
end end
@ -102,4 +102,10 @@ class ApplicationController < ActionController::Base
raw.map { |item| cached_keys_with_value[item.cache_key] || uncached[item.id] }.compact raw.map { |item| cached_keys_with_value[item.cache_key] || uncached[item.id] }.compact
end end
def respond_with_error(code)
set_locale do
render "errors/#{code}", layout: 'error', status: code
end
end
end end