update custom error pages

app/Exceptions/Handler.php

@@ -108,6 +108,6 @@ class Handler extends ExceptionHandler
      */
     protected function renderExceptionInBrief(Exception $e)
     {
-        return response()->view('errors.brief');
+        return response()->view('errors.exception', ['message' => $e->getMessage()]);
     }
 }

resources/lang/en/errors.yml

@@ -6,11 +6,6 @@ http:
 general:
   title: Error occurred
 
-brief:
-  message: Whoops, looks like something went wrong. (enable APP_DEBUG in .env to see details)
-
 exception:
-  title: Some errors occurred
-  code: 'Error code: :code'
-  message: 'Details: :msg'
-  location: 'File location: :location'
+  message: |
+    Whoops, looks like something went wrong. (enable APP_DEBUG in .env to see details)

resources/lang/zh_CN/errors.yml

@@ -6,11 +6,7 @@ http:
 general:
   title: 出现错误
 
-brief:
-  message: 哎呀，你似乎触发了一个错误（开启 .env 中的 APP_DEBUG 以查看详细信息）
-
 exception:
-  title: 出现了一些错误
-  code: 错误码：:code
-  message: 详细信息：:msg
-  location: 文件位置：:location
+  message: |
+    如果您是访客，这说明网站程序出现了一些错误，请您稍后再试或联系站长。
+    如果您是站长，请开启 .env 中的 APP_DEBUG 以查看详细信息。

resources/views/errors/brief.tpl

@@ -1,12 +0,0 @@
-@extends('errors.general')
-
-@section('title', trans('errors.general.title'))
-
-@section('content')
-<h1>{{ trans('errors.general.title') }}
-@include('setup.wizard.language')
-</h1>
-
-<p>{{ trans('errors.brief.message') }}</p>
-
-@endsection

resources/views/errors/exception.tpl

@@ -3,12 +3,12 @@
 @section('title', trans('errors.general.title'))
 
 @section('content')
-<h1>{{ $level.': '.trans('errors.exception.title') }}
+<h1>{{ trans('errors.general.title') }}
 @include('setup.wizard.language')
 </h1>
 
-<p>{{ trans('errors.exception.message', ['msg' => $message]) }}</p>
+<p>{{ $message }}</p>
 
-<p>{!! trans('errors.exception.location', ['location' => "<b>$file: $line</b>"]) !!}</p>
+<p>{!! nl2br(trans('errors.exception.message')) !!}</p>
 
 @endsection