From d16483bacb748b9b0ee26d6a462a0f3ef0d7fb57 Mon Sep 17 00:00:00 2001
From: Pig Fang <g-plane@hotmail.com>
Date: Sun, 22 Jul 2018 16:16:29 +0800
Subject: [PATCH] Add custom HTTP-500 error page

---
 resources/lang/en/errors.yml    |  1 +
 resources/lang/zh_CN/errors.yml |  1 +
 resources/views/errors/500.tpl  | 11 +++++++++++
 3 files changed, 13 insertions(+)
 create mode 100644 resources/views/errors/500.tpl

diff --git a/resources/lang/en/errors.yml b/resources/lang/en/errors.yml
index 8254d49a..d5791f96 100644
--- a/resources/lang/en/errors.yml
+++ b/resources/lang/en/errors.yml
@@ -1,6 +1,7 @@
 http:
   msg-403: You have no permission to access this page.
   msg-404: Nothing here.
+  msg-500: Please try again later.
   msg-503: The application is now in maintenance mode.
 
 general:
diff --git a/resources/lang/zh_CN/errors.yml b/resources/lang/zh_CN/errors.yml
index f4df7a57..876d9e19 100644
--- a/resources/lang/zh_CN/errors.yml
+++ b/resources/lang/zh_CN/errors.yml
@@ -1,6 +1,7 @@
 http:
   msg-403: 你并没有权限查看此页面
   msg-404: 这里啥都没有哦
+  msg-500: 服务器内部错误，请稍后再试
   msg-503: 网站维护中
 
 general:
diff --git a/resources/views/errors/500.tpl b/resources/views/errors/500.tpl
new file mode 100644
index 00000000..81cdb272
--- /dev/null
+++ b/resources/views/errors/500.tpl
@@ -0,0 +1,11 @@
+@extends('errors.general')
+
+@section('title', '500 Internal Server Error')
+
+@section('content')
+<h1>500 Internal Server Error
+    @include('setup.wizard.language')
+</h1>
+
+<p>{{ trans('errors.exception.detail', ['msg' => $exception->getMessage() ?: trans('errors.http.msg-500')]) }}</p>
+@endsection