Skip to content

Commit b9b49c4

Browse files
committed
Translations and form improvements
1 parent 3da4dce commit b9b49c4

7 files changed

Lines changed: 161 additions & 41 deletions

File tree

src/Controllers/TicketsController.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -824,7 +824,7 @@ public function search_form_defaults()
824824
public function register_search_fields(Request $request)
825825
{
826826
$result = "error";
827-
$message = "No field was registered";
827+
$message = trans('panichd::lang.searchform-validation-no-field');
828828

829829
// Forget last search
830830
session()->forget('search_fields');
@@ -854,7 +854,7 @@ public function register_search_fields(Request $request)
854854
session(compact('search_fields'));
855855

856856
$result = "ok";
857-
$message = count($search_fields) . " fields registered";
857+
$message = trans('panichd::lang.searchform-validation-success', ['num' => count($search_fields)]);
858858
}
859859

860860
return response()->json(['result' => $result, 'messages' => [$message]]);

src/Translations/ca/lang.php

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -348,6 +348,49 @@
348348
'validate-comment-required' => 'Cal que escriguis el text del comentari',
349349
'validate-comment-min' => 'Cal posar un text més llarg al comentari',
350350

351+
352+
// Cercador de tiquets
353+
'searchform-nav-text' => 'Cercar',
354+
'searchform-title' => 'Cercar tiquets',
355+
356+
'searchform-creator' => 'Creador',
357+
'searchform-department' => 'Departament',
358+
'searchform-comments' => 'Text als comentaris',
359+
'searchform-attachment_filename' => 'Nom d\'adjunt',
360+
'searchform-any_text_field' => 'Qualsevol camp de text',
361+
'searchform-created_at' => 'Creació',
362+
'searchform-completed_at' => 'Tancament',
363+
'searchform-updated_at' => 'Darrera actualització',
364+
365+
'searchform-help-creator' => 'Qui va crear el tiquet (A vegades és un tècnic en nom d\'un Membre)',
366+
'searchform-help-owner' => 'A qui pertany el tiquet',
367+
'searchform-help-department' => 'Departament del propietari del tiquet',
368+
'searchform-help-any_text_field' => 'Cercar a qualsevol camp de text entre el tema, descripció, actuació, comentaris o camps de fitxers adjunts',
369+
370+
'searchform-creator-none' => '- cap -',
371+
'searchform-owner-none' => '- cap -',
372+
'searchform-department-none' => '- cap -',
373+
'searchform-list-none' => '- cap -',
374+
'searchform-status-none' => '- cap -',
375+
'searchform-priority-none' => '- cap -',
376+
'searchform-category-none' => '- cap -',
377+
'searchform-agent-none' => '- cap -',
378+
379+
'searchform-date-type-from' => 'En endavant',
380+
'searchform-date-type-until' => 'Més antics',
381+
'searchform-date-type-exact_year' => 'Any exacte',
382+
'searchform-date-type-exact_month'=> 'Any i mes',
383+
'searchform-date-type-exact_day' => 'Dia exacte',
384+
385+
'searchform-btn-submit' => 'Cercar',
386+
387+
'searchform-validation-no-field' => 'No s\'ha indicat cap camp de cerca',
388+
'searchform-validation-success' => 'S\'ha registrat :num camps de cerca',
389+
390+
'searchform-results-title' => 'Resultats de la cerca',
391+
'searchform-btn-edit' => 'Editar cerca',
392+
393+
351394
/*
352395
* Controllers
353396
*/

src/Translations/en/lang.php

Lines changed: 41 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -344,10 +344,50 @@
344344
'ticket-destroy-error' => 'The ticket could not be deleted: :error',
345345
'comment-destroy-error' => 'The comment could not be deleted: :error',
346346

347-
// Comment form
347+
// Comment form
348348
'validate-comment-required' => 'You must type the comment text',
349349
'validate-comment-min' => 'You must type a longer text for the comment',
350350

351+
// Ticket search form
352+
'searchform-nav-text' => 'Search',
353+
'searchform-title' => 'Search tickets',
354+
355+
'searchform-creator' => 'Creator',
356+
'searchform-department' => 'Department',
357+
'searchform-comments' => 'Comments text',
358+
'searchform-attachment_filename' => 'Attachment filename',
359+
'searchform-any_text_field' => 'Any text field',
360+
'searchform-created_at' => 'Creation datetime',
361+
'searchform-completed_at' => 'Completion datetime',
362+
'searchform-updated_at' => 'Last update',
363+
364+
'searchform-help-creator' => 'Who created the ticket (Sometimes is an agent in the name of a Member)',
365+
'searchform-help-owner' => 'Member that owns the ticket',
366+
'searchform-help-department' => 'Owner departments',
367+
'searchform-help-any_text_field' => 'Find in any text field in: Subject, Description, Intervention, Comments or attachment fields',
368+
369+
'searchform-creator-none' => '- none -',
370+
'searchform-owner-none' => '- none -',
371+
'searchform-department-none' => '- none -',
372+
'searchform-list-none' => '- none -',
373+
'searchform-status-none' => '- none -',
374+
'searchform-priority-none' => '- none -',
375+
'searchform-category-none' => '- none -',
376+
'searchform-agent-none' => '- none -',
377+
378+
'searchform-date-type-from' => 'From specified',
379+
'searchform-date-type-until' => 'Until specified',
380+
'searchform-date-type-exact_year' => 'Exact Year',
381+
'searchform-date-type-exact_month'=> 'Year, month',
382+
'searchform-date-type-exact_day' => 'Exact day',
383+
384+
'searchform-btn-submit' => 'Search',
385+
386+
'searchform-validation-no-field' => 'No field was introduced',
387+
'searchform-validation-success' => ':num search fields registered',
388+
389+
'searchform-results-title' => 'Search results',
390+
'searchform-btn-edit' => 'Edit search',
351391

352392
/*
353393
* Controllers

src/Translations/es/lang.php

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,47 @@
8989
'show-ticket-modal-delete-title' => 'Borrar Tiquete',
9090
'show-ticket-modal-delete-message' => '¿Estás seguro que quieres borrar: :subject?',
9191

92+
// Buscador de tiques
93+
'searchform-nav-text' => 'Buscar',
94+
'searchform-title' => 'Buscar tiques',
95+
96+
'searchform-creator' => 'Creador',
97+
'searchform-department' => 'Departamento',
98+
'searchform-comments' => 'Texto en los comentarios',
99+
'searchform-attachment_filename' => 'Nombre de adjunto',
100+
'searchform-any_text_field' => 'Cualquier campo de texto',
101+
'searchform-created_at' => 'Creación',
102+
'searchform-completed_at' => 'Cierre',
103+
'searchform-updated_at' => 'Ultima actualitzación',
104+
105+
'searchform-help-creator' => 'Quién creó el tique (A veces es un técnico en nombre de un Miembro)',
106+
'searchform-help-owner' => 'A quién pertenece el tique',
107+
'searchform-help-department' => 'Departamento del propietario del tique',
108+
'searchform-help-any_text_field' => 'Buscar en cualquier campo de texto entre el tema, descripción, actuación, comentarios o campos de ficheros adjuntos',
109+
110+
'searchform-creator-none' => '- ninguno -',
111+
'searchform-owner-none' => '- ninguno -',
112+
'searchform-department-none' => '- ninguno -',
113+
'searchform-list-none' => '- ninguna -',
114+
'searchform-status-none' => '- ninguno -',
115+
'searchform-priority-none' => '- ninguna -',
116+
'searchform-category-none' => '- ninguna -',
117+
'searchform-agent-none' => '- ninguno -',
118+
119+
'searchform-date-type-from' => 'En adelante',
120+
'searchform-date-type-until' => 'Más antiguos',
121+
'searchform-date-type-exact_year' => 'Año exacto',
122+
'searchform-date-type-exact_month'=> 'Año y mes',
123+
'searchform-date-type-exact_day' => 'Día exacto',
124+
125+
'searchform-btn-submit' => 'Buscar',
126+
127+
'searchform-validation-no-field' => 'No se ha indicado ningún campo de búsqueda',
128+
'searchform-validation-success' => 'Se ha registrado :num campos de búsqueda',
129+
130+
'searchform-results-title' => 'Resultados de la búsqueda',
131+
'searchform-btn-edit' => 'Editar búsqueda',
132+
92133
/*
93134
* Controllers
94135
*/

src/Views/shared/nav.blade.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,9 @@
4444
</a>
4545
</li>
4646

47-
<li class="nav-item {!! $tools->fullUrlIs(action('\PanicHD\PanicHD\Controllers\TicketsController@search_form')) ? "active" : "" !!}">
47+
<li id="nav_search_li" class="nav-item {!! $tools->fullUrlIs(action('\PanicHD\PanicHD\Controllers\TicketsController@search_form')) ? "active" : "" !!}">
4848
<a class="nav-link" href="{{ action('\PanicHD\PanicHD\Controllers\TicketsController@search_form') }}">
49-
<span>Search</span>
49+
<span>{{ trans('panichd::lang.searchform-nav-text') }}</span>
5050
</a>
5151
</li>
5252

src/Views/tickets/search.blade.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
@extends($master)
22
@section('page')
3-
Search tickets
3+
{{ trans('panichd::lang.searchform-title') }}
44
@endsection
55

66
@include('panichd::shared.common')
@@ -11,8 +11,8 @@
1111
@include('panichd::tickets.search.form')
1212
<div id="search_results" class="card bg-light" style="display: none">
1313
<div class="card-body">
14-
<h5 class="card-title mb-4">Search results
15-
<button type="button" id="edit_search" class="btn btn-default btn-sm ml-4">Edit search</button>
14+
<h5 class="card-title mb-4">{{ trans('panichd::lang.searchform-results-title') }}
15+
<button type="button" id="edit_search" class="btn btn-default btn-sm ml-4">{{ trans('panichd::lang.searchform-btn-edit') }}</button>
1616
</h5>
1717
@include('panichd::tickets.datatable.header')
1818
</div>

0 commit comments

Comments
 (0)