diff --git a/resources/lang/en/errors.yml b/resources/lang/en/errors.yml index 69cf29ac..82451803 100644 --- a/resources/lang/en/errors.yml +++ b/resources/lang/en/errors.yml @@ -1,9 +1,13 @@ -details: 'Details:' -error403: You cannot view this page without authority. -error404: Nothing here. -error503: Application is now in maintenance mode. -be-right-back: Be right back. -error-occurred: Error occurred. -some-errors: 'Some errors occurred:' -error-code: 'Error code:' -file-location: 'File location:' \ No newline at end of file +http: + msg-403: You have no permission to access this page. + msg-404: Nothing here. + msg-503: The application is now in maintenance mode. + +general: + title: Error occurred + +exception: + title: Some errors occurred + code: 'Error code: :code' + message: 'Details: :msg' + location: 'File location: :location' diff --git a/resources/lang/zh-CN/errors.yml b/resources/lang/zh-CN/errors.yml index 2e2131af..96c4037c 100644 --- a/resources/lang/zh-CN/errors.yml +++ b/resources/lang/zh-CN/errors.yml @@ -1,9 +1,13 @@ -details: 详细信息: -error403: 你并没有权限查看此页面 -error404: 这里啥都没有哦 -error503: 网站维护中 -be-right-back: 马上回来 -error-occurred: 出现错误 -some-errors: 出现了一些错误: -error-code: 错误码: -file-location: 文件位置: \ No newline at end of file +http: + msg-403: 你并没有权限查看此页面 + msg-404: 这里啥都没有哦 + msg-503: 网站维护中 + +general: + title: 出现错误 + +exception: + title: 出现了一些错误 + code: 错误码::code + message: 详细信息::msg + location: 文件位置::location diff --git a/resources/views/errors/403.tpl b/resources/views/errors/403.tpl index a2e6d064..8abdf4f2 100644 --- a/resources/views/errors/403.tpl +++ b/resources/views/errors/403.tpl @@ -5,5 +5,5 @@ @section('content')
{{ trans('errors.details').$exception->getMessage() ?: trans('error.error403') }}
+{{ trans('errors.exception.message', ['msg' => $exception->getMessage() ?: trans('errors.http.msg-403')]) }}
@endsection diff --git a/resources/views/errors/404.tpl b/resources/views/errors/404.tpl index 6542ec15..ebe7ebca 100644 --- a/resources/views/errors/404.tpl +++ b/resources/views/errors/404.tpl @@ -3,7 +3,8 @@ @section('title', '404 Not Found') @section('content') +{{ trans('errors.details').$exception->getMessage() ?: trans('errors.error404') }}
+{{ trans('errors.exception.message', ['msg' => $exception->getMessage() ?: trans('errors.http.msg-404')]) }}
@endsection diff --git a/resources/views/errors/503.tpl b/resources/views/errors/503.tpl index 94a3d8b1..349e3234 100644 --- a/resources/views/errors/503.tpl +++ b/resources/views/errors/503.tpl @@ -3,7 +3,7 @@ @section('title', '503 Service Unavailable') @section('content') -{{ trans('errors.details').$exception->getMessage() ?: trans('errors.error503') }}
+{{ trans('errors.exception.message', ['msg' => $exception->getMessage() ?: trans('errors.http.msg-503')]) }}
@endsection diff --git a/resources/views/errors/e.tpl b/resources/views/errors/e.tpl index 81d07ef9..dc834a1e 100644 --- a/resources/views/errors/e.tpl +++ b/resources/views/errors/e.tpl @@ -1,10 +1,10 @@ @extends('errors.general') -@section('title', trans('errors.error-occurred')) +@section('title', trans('errors.general.title')) @section('content') -{{ trans('error.error-code').$code }}
-{!! trans('error.details').$message !!}
+{{ trans('error.exception.code', ['code' => $code]) }}
+{!! trans('error.exception.message', ['message' => $message]) !!}
@endsection diff --git a/resources/views/errors/exception.tpl b/resources/views/errors/exception.tpl index 7a9c2338..9805c6c2 100644 --- a/resources/views/errors/exception.tpl +++ b/resources/views/errors/exception.tpl @@ -1,12 +1,12 @@ @extends('errors.general') -@section('title', trans('errors.error-occurred')) +@section('title', trans('errors.general.title')) @section('content') -{{ trans('errors.details').$message }}
+{{ trans('errors.exception.message', ['msg' => $message]) }}
-{{ trans('errors.file-location') }}{{ $file }}: {{ $line }}
+{!! trans('errors.exception.location', ['location' => "$file: $line"]) !!}
@endsection diff --git a/resources/views/errors/general.tpl b/resources/views/errors/general.tpl index 6d9c4f17..45349c51 100644 --- a/resources/views/errors/general.tpl +++ b/resources/views/errors/general.tpl @@ -5,7 +5,7 @@