diff --git a/app/Exceptions/Handler.php b/app/Exceptions/Handler.php index 5995b48a..a096c58b 100644 --- a/app/Exceptions/Handler.php +++ b/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()]); } } diff --git a/resources/lang/en/errors.yml b/resources/lang/en/errors.yml index b7de6fa5..a435a760 100644 --- a/resources/lang/en/errors.yml +++ b/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) diff --git a/resources/lang/zh_CN/errors.yml b/resources/lang/zh_CN/errors.yml index c4d239cb..31db5b5c 100644 --- a/resources/lang/zh_CN/errors.yml +++ b/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 以查看详细信息。 diff --git a/resources/views/errors/brief.tpl b/resources/views/errors/brief.tpl deleted file mode 100644 index a4c30721..00000000 --- a/resources/views/errors/brief.tpl +++ /dev/null @@ -1,12 +0,0 @@ -@extends('errors.general') - -@section('title', trans('errors.general.title')) - -@section('content') -
{{ trans('errors.brief.message') }}
- -@endsection diff --git a/resources/views/errors/exception.tpl b/resources/views/errors/exception.tpl index dbdae620..0a0aede4 100644 --- a/resources/views/errors/exception.tpl +++ b/resources/views/errors/exception.tpl @@ -3,12 +3,12 @@ @section('title', trans('errors.general.title')) @section('content') -{{ trans('errors.exception.message', ['msg' => $message]) }}
+{{ $message }}
-{!! trans('errors.exception.location', ['location' => "$file: $line"]) !!}
+{!! nl2br(trans('errors.exception.message')) !!}
@endsection