Skip to content

Commit 1f734e4

Browse files
promatikpromatik
committed
Added all error translations
Refactored error views
1 parent 17b13cc commit 1f734e4

File tree

14 files changed

+50
-117
lines changed

14 files changed

+50
-117
lines changed

‎src/resources/lang/en/base.php‎

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,22 @@
5252
'error_saving' => 'Error while saving. Please try again.',
5353
'welcome' => 'Welcome!',
5454
'use_sidebar' => 'Use the sidebar to the left to create, edit or delete content.',
55-
'error_title' => 'Error :error',
56-
'error_button' => 'Take me home',
55+
56+
'error' => [
57+
'title' => 'Error :error',
58+
'button' => 'Take me home',
59+
'message_4xx' => 'Please <a :href_back>go back</a> or return to <a :href_homepage>our homepage</a>.',
60+
'message_500' => 'An internal server error has occurred. If the error persists please contact the development team.',
61+
'message_503' => 'The server is overloaded or down for maintenance. Please try again later.',
62+
'400' => 'Bad request.',
63+
'401' => 'Unauthorized action.',
64+
'403' => 'Forbidden.',
65+
'404' => 'Page not found.',
66+
'405' => 'Method not allowed.',
67+
'408' => 'Request timeout.',
68+
'429' => 'Too many requests.',
69+
'500' => 'It\'s not you, it\'s me.',
70+
],
5771

5872
'password_reset' => [
5973
'greeting' => 'Hello!',

‎src/resources/lang/pt/base.php‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,11 @@
5252
'error_saving' => 'Ocorreu um erro ao guardar. Tente novamente.',
5353
'welcome' => 'Bem-vindo!',
5454
'use_sidebar' => 'Use a barra lateral à esquerda para criar, editar ou apagar conteúdo.',
55-
'error_title' => 'Erro :error',
56-
'error_button' => 'Voltar ao início',
55+
56+
'error' => [
57+
'title' => 'Erro :error',
58+
'button' => 'Voltar ao início',
59+
],
5760

5861
'password_reset' => [
5962
'greeting' => 'Olá!',

‎src/resources/views/ui/errors/400.blade.php‎

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,5 @@
1-
@extends(backpack_view('errors.layout'))
1+
@extends(backpack_view('errors.4xx'))
22

33
@php
44
$error_number = 400;
55
@endphp
6-
7-
@section('title')
8-
Bad request.
9-
@endsection
10-
11-
@section('description')
12-
@php
13-
$default_error_message = "Please <a href='javascript:history.back()''>go back</a> or return to <a href='".url('')."'>our homepage</a>.";
14-
@endphp
15-
{!! isset($exception)? ($exception->getMessage()?e($exception->getMessage()):$default_error_message): $default_error_message !!}
16-
@endsection

‎src/resources/views/ui/errors/401.blade.php‎

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,5 @@
1-
@extends(backpack_view('errors.layout'))
1+
@extends(backpack_view('errors.4xx'))
22

33
@php
44
$error_number = 401;
55
@endphp
6-
7-
@section('title')
8-
Unauthorized action.
9-
@endsection
10-
11-
@section('description')
12-
@php
13-
$default_error_message = "Please <a href='javascript:history.back()''>go back</a> or return to <a href='".url('')."'>our homepage</a>.";
14-
@endphp
15-
{!! isset($exception)? ($exception->getMessage()?e($exception->getMessage()):$default_error_message): $default_error_message !!}
16-
@endsection

‎src/resources/views/ui/errors/403.blade.php‎

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,5 @@
1-
@extends(backpack_view('errors.layout'))
1+
@extends(backpack_view('errors.4xx'))
22

33
@php
44
$error_number = 403;
55
@endphp
6-
7-
@section('title')
8-
Forbidden.
9-
@endsection
10-
11-
@section('description')
12-
@php
13-
$default_error_message = "Please <a href='javascript:history.back()''>go back</a> or return to <a href='".url('')."'>our homepage</a>.";
14-
@endphp
15-
{!! isset($exception)? ($exception->getMessage()?e($exception->getMessage()):$default_error_message): $default_error_message !!}
16-
@endsection

‎src/resources/views/ui/errors/404.blade.php‎

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,5 @@
1-
@extends(backpack_view('errors.layout'))
1+
@extends(backpack_view('errors.4xx'))
22

33
@php
44
$error_number = 404;
55
@endphp
6-
7-
@section('title')
8-
Page not found.
9-
@endsection
10-
11-
@section('description')
12-
@php
13-
$default_error_message = "Please <a href='javascript:history.back()''>go back</a> or return to <a href='".url('')."'>our homepage</a>.";
14-
@endphp
15-
{!! isset($exception)? ($exception->getMessage()?e($exception->getMessage()):$default_error_message): $default_error_message !!}
16-
@endsection

‎src/resources/views/ui/errors/405.blade.php‎

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,5 @@
1-
@extends(backpack_view('errors.layout'))
1+
@extends(backpack_view('errors.4xx'))
22

33
@php
44
$error_number = 405;
55
@endphp
6-
7-
@section('title')
8-
Method not allowed.
9-
@endsection
10-
11-
@section('description')
12-
@php
13-
$default_error_message = "Please <a href='javascript:history.back()''>go back</a> or return to <a href='".url('')."'>our homepage</a>.";
14-
@endphp
15-
{!! isset($exception)? ($exception->getMessage()?e($exception->getMessage()):$default_error_message): $default_error_message !!}
16-
@endsection

‎src/resources/views/ui/errors/408.blade.php‎

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,5 @@
1-
@extends(backpack_view('errors.layout'))
1+
@extends(backpack_view('errors.4xx'))
22

33
@php
44
$error_number = 408;
55
@endphp
6-
7-
@section('title')
8-
Request timeout.
9-
@endsection
10-
11-
@section('description')
12-
@php
13-
$default_error_message = "Please <a href='javascript:history.back()''>go back</a>, refresh the page and try again.";
14-
15-
@endphp
16-
{!! isset($exception)? ($exception->getMessage()?e($exception->getMessage()):$default_error_message): $default_error_message !!}
17-
@endsection

‎src/resources/views/ui/errors/429.blade.php‎

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,5 @@
1-
@extends(backpack_view('errors.layout'))
1+
@extends(backpack_view('errors.4xx'))
22

33
@php
44
$error_number = 429;
55
@endphp
6-
7-
@section('title')
8-
Too many requests.
9-
@endsection
10-
11-
@section('description')
12-
@php
13-
$default_error_message = "Please <a href='javascript:history.back()''>go back</a> and try again, or return to <a href='".url('')."'>our homepage</a>.";
14-
@endphp
15-
{!! isset($exception)? ($exception->getMessage()?e($exception->getMessage()):$default_error_message): $default_error_message !!}
16-
@endsection

‎src/resources/views/ui/errors/4xx.blade.php‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
@extends(backpack_view('errors.layout'))
2+
3+
@section('title')
4+
{{ trans('backpack::base.error.'.$error_number) }}
5+
@endsection
6+
7+
@section('description')
8+
{!! $exception?->getMessage() ? e($exception->getMessage()) : trans('backpack::base.error.message_4xx', [
9+
'href_back' => 'href="javascript:history.back()"',
10+
'href_homepage' => 'href="'.url('').'"',
11+
]) !!}
12+
@endsection

0 commit comments

Comments
 (0)