Skip to content

Commit 07013a2

Browse files
mckaygerhardmckaygerhard
authored
Merge sync orginal into fork from scoumbourdis/master to sync up to date
sync with original repo, also then to able to make a configurable image preview patch later
2 parents b470276 + 29e9e60 commit 07013a2

File tree

7 files changed

+146
-44
lines changed

7 files changed

+146
-44
lines changed

‎application/libraries/Grocery_CRUD.php‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3256,12 +3256,14 @@ public function getStateInfo()
32563256
if (is_array($data['search_field'])) {
32573257
$search_array = array();
32583258
foreach ($data['search_field'] as $search_key => $search_field_name) {
3259+
$search_field_name = preg_replace('/[^a-zA-Z0-9_]/', '' , $search_field_name);
32593260
$search_array[$search_field_name] = isset($data['search_text'][$search_key]) ? $data['search_text'][$search_key] : '';
32603261
}
32613262
$state_info->search = $search_array;
32623263
} else {
3264+
$field_name = preg_replace('/[^a-zA-Z0-9_]/', '' , $data['search_field']);
32633265
$state_info->search = (object)array(
3264-
'field' => strip_tags($data['search_field']) ,
3266+
'field' => $field_name,
32653267
'text' => $data['search_text'] );
32663268
}
32673269
}

‎assets/grocery_crud/languages/catalan.php‎

100755100644
File mode changed.

‎assets/grocery_crud/languages/french.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,5 +97,5 @@
9797

9898

9999
/* Added in version 1.6.1 */
100-
$lang['list_clone'] = 'Clone';
100+
$lang['list_clone'] = 'Dupliquer';
101101

‎assets/grocery_crud/languages/lithuanian.php‎

Lines changed: 36 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1,53 +1,52 @@
1-
<?php
2-
/* Translated by alex@gnosi.lt */
1+
<?php /* Translated by alex@gnosi.lt, updated by dgvirtual@akl.lt */
32
$lang['list_add'] = 'Pridėti';
43
$lang['list_actions'] = 'Veiksmai';
54
$lang['list_page'] = 'Puslapis';
65
$lang['list_paging_of'] = 'iš';
76
$lang['list_displaying'] = 'Rodoma nuo {start} iki {end} iš {results} užrašų';
87
$lang['list_filtered_from'] = '(išfiltruota iš {total_results} užrašų)';
98
$lang['list_show_entries'] = 'Rodyti {paging} užrašų';
10-
$lang['list_no_items'] = 'Nera įrašų atvaizdavimui';
9+
$lang['list_no_items'] = 'Nėra rodytinų įrašų';
1110
$lang['list_zero_entries'] = 'Rodoma 0 įrašų, nes yra 0 įrašų.';
1211
$lang['list_search'] = 'Paieška';
1312
$lang['list_search_all'] = 'Ieškoti visur';
1413
$lang['list_clear_filtering'] = 'Valyti filtrą';
1514
$lang['list_delete'] = 'Trinti';
1615
$lang['list_edit'] = 'Redaguoti';
1716
$lang['list_paging_first'] = 'Pirmas';
18-
$lang['list_paging_previous'] = 'Prieštai esantis';
19-
$lang['list_paging_next'] = 'Sekantis';
17+
$lang['list_paging_previous'] = 'Ankstesnis';
18+
$lang['list_paging_next'] = 'Kitas';
2019
$lang['list_paging_last'] = 'Paskutinis';
21-
$lang['list_loading'] = 'Kraunama...';
20+
$lang['list_loading'] = 'Įkeliama...';
2221

2322
$lang['form_edit'] = 'Redaguoti';
2423
$lang['form_back_to_list'] = 'Atgal į sąrašą';
2524
$lang['form_update_changes'] = 'Saugoti pakeitimus';
2625
$lang['form_cancel'] = 'Atšaukti';
27-
$lang['form_update_loading'] = 'Kraunama, informacijos atnaujinimas...';
28-
$lang['update_success_message'] = 'Info sekmingai atnaujinta.';
26+
$lang['form_update_loading'] = 'Įkeliama, atnaujinama informacija...';
27+
$lang['update_success_message'] = 'Informacija sekmingai atnaujinta.';
2928
$lang['form_go_back_to_list'] = 'Grįžti prie sąrašo';
3029

3130
$lang['form_add'] = 'Pridėti';
32-
$lang['insert_success_message'] = 'Info sekmingai įrašyta į Duomenų bazę.';
31+
$lang['insert_success_message'] = 'Duomenys sekmingai įrašyti į duomenų bazę.';
3332
$lang['form_or'] = 'arba';
34-
$lang['form_save'] = 'saugoti';
35-
$lang['form_insert_loading'] = 'Kraunama, info saugoma...';
33+
$lang['form_save'] = 'Įrašyti';
34+
$lang['form_insert_loading'] = 'Įkeliama, duomenys įrašomi...';
3635

37-
$lang['form_upload_a_file'] = 'Atsiųsti bylą';
36+
$lang['form_upload_a_file'] = 'Įkelti failą';
3837
$lang['form_upload_delete'] = 'Trinti';
3938
$lang['form_button_clear'] = 'Valyti';
4039

41-
$lang['delete_success_message'] = 'Info išvalyta iš duomenų bazės.';
42-
$lang['delete_error_message'] = 'Info neišvalyta is Duomenų bazės.';
40+
$lang['delete_success_message'] = 'Duomenys sėkmingai ištrinti iš duomenų bazės.';
41+
$lang['delete_error_message'] = 'Duomenys neištrinti iš duomenų bazės.';
4342

4443
/* Javascript messages */
45-
$lang['alert_add_form'] = 'Įrašyta info gali būti neišsaugota.\\nNorite grįžti prie sąrašo?';
46-
$lang['alert_edit_form'] = 'Pakeista info gali būti neišsaugota.\\nNorite grįžti prie sąrašo?';
44+
$lang['alert_add_form'] = 'Įvesti duomenys gali būti neišsaugoti.\\nAr tikrai norite grįžti prie sąrašo?';
45+
$lang['alert_edit_form'] = 'Pakeisti duomenys gali būti neišsaugoti.\\nAr tikrai norite grįžti prie sąrašo?';
4746
$lang['alert_delete'] = 'Ar tikrai noriti ištrinti įrašą?';
4847

4948
$lang['insert_error'] = 'Įrašant įvyko klaida.';
50-
$lang['update_error'] = 'Įrašant įvyko klaida.';
49+
$lang['update_error'] = 'Įrašant pakeitimus įvyko klaida.';
5150

5251
/* Added in version 1.2.1 */
5352
$lang['set_relation_title'] = 'pasirinkti {field_display_as}';
@@ -56,46 +55,43 @@
5655
$lang['form_active'] = 'aktyvu';
5756

5857
/* Added in version 1.2.2 */
59-
$lang['form_save_and_go_back'] = 'Saugoti ir grįžti į sąrašą';
60-
$lang['form_update_and_go_back']= 'Saugoti pakeitimus ir grįžti į sąrašą';
58+
$lang['form_save_and_go_back'] = 'Įrašyti ir grįžti į sąrašą';
59+
$lang['form_update_and_go_back']= 'Įrašyti pakeitimus ir grįžti į sąrašą';
6160

6261
/* Upload functionality */
63-
$lang['string_delete_file'] = 'Bylos šalinimas';
62+
$lang['string_delete_file'] = 'Failas ištrinamas';
6463
$lang['string_progress'] = 'Progresas: ';
65-
$lang['error_on_uploading'] = 'Ivyko klaida, byla neužkrauta.';
66-
$lang['message_prompt_delete_file'] = 'Ar Jus tikrai norite ištrinti šia bylą?';
64+
$lang['error_on_uploading'] = 'Įkeliant failą įvyko klaida.';
65+
$lang['message_prompt_delete_file'] = 'Ar Jus tikrai norite ištrinti šį failą?';
6766

68-
$lang['error_max_number_of_files'] = 'Vienu karti galite užkrauti tik viena bylą.';
69-
$lang['error_accept_file_types'] = 'Negalima užkrauti bylos, dėl bylos fotmato.';
70-
$lang['error_max_file_size'] = 'Byla labai didelė, negalima jos užgrauti. Dydis: {max_file_size}.';
71-
$lang['error_min_file_size'] = 'Negalima užkrauti tuščios bylos.';
67+
$lang['error_max_number_of_files'] = 'Vienu metu galite įkelti tik vieną failą.';
68+
$lang['error_accept_file_types'] = 'Negalima įkelti failo su tokiu praplėtimu.';
69+
$lang['error_max_file_size'] = 'Failas per didelis, didžiausias leistinas dydis – {max_file_size}.';
70+
$lang['error_min_file_size'] = 'Negalima įkelti tuščio failo.';
7271

7372
/* Added in version 1.3.1 */
7473
$lang['list_export'] = 'Eksportuoti';
7574
$lang['list_print'] = 'Spausdinti';
7675
$lang['minimize_maximize'] = 'Sumažinti/Padidinti';
7776

7877
/* Added in version 1.4 */
79-
$lang['list_view'] = 'Pažiūrėti';
78+
$lang['list_view'] = 'Peržiūrėti';
8079

8180
/* Added in version 1.5.1 */
8281
$lang['ui_day'] = 'dd';
8382
$lang['ui_month'] = 'mm';
84-
$lang['ui_year'] = 'yyyy';
83+
$lang['ui_year'] = 'mmmm';
8584

86-
/* Added in version 1.5.2 */
87-
$lang['list_more'] = 'More';
85+
/* Added in version 1.5.2 */
86+
$lang['list_more'] = 'Daugiau';
8887

89-
/* Added in version 1.5.6 */
90-
$lang['list_search_column'] = 'Search {column_name}';
88+
/* Added in version 1.5.6 */
89+
$lang['list_search_column'] = 'Ieškoti {column_name}';
9190

92-
/* Added in version 1.5.8 */
93-
$lang['alert_delete_multiple'] = 'Are you sure that you want to delete those {items_amount} items?';
91+
/* Added in version 1.5.8 */
92+
$lang['alert_delete_multiple'] = 'Ar esate tikri, kad norite ištrinti šiuos {items_amount} įrašus/-ų?';
93+
$lang['alert_delete_multiple_one'] = 'Ar esate tikri, kad norite ištrinti šį įrašą?'
9494

95-
$lang['alert_delete_multiple_one'] = 'Are you sure that you want to delete this 1 item?';
96-
97-
98-
99-
/* Added in version 1.6.1 */
100-
$lang['list_clone'] = 'Clone';
95+
/* Added in version 1.6.1 */
96+
$lang['list_clone'] = 'Klonuoti';
10197

‎assets/grocery_crud/languages/spanish-uy.php‎

Lines changed: 99 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,99 @@
1+
<?php
2+
/** Translated by: Mauricio López Coria */
3+
$lang['list_add'] = 'Agregar';
4+
$lang['list_actions'] = 'Acciones';
5+
$lang['list_page'] = 'Página';
6+
$lang['list_paging_of'] = 'de';
7+
$lang['list_displaying'] = 'Mostrando del {start} al {end} de {results} registros';
8+
$lang['list_filtered_from'] = '(filtrando de {total_results} total registros)';
9+
$lang['list_show_entries'] = 'Mostrar {paging} registros';
10+
$lang['list_no_items'] = 'No hay registros para mostrar';
11+
$lang['list_zero_entries'] = 'Mostrando 0 registros';
12+
$lang['list_search'] = 'Buscar';
13+
$lang['list_search_all'] = 'Buscar todo';
14+
$lang['list_clear_filtering'] = 'Restablecer filtro';
15+
$lang['list_delete'] = 'Borrar';
16+
$lang['list_edit'] = 'Editar';
17+
$lang['list_paging_first'] = 'Primero';
18+
$lang['list_paging_previous'] = 'Anterior';
19+
$lang['list_paging_next'] = 'Siguiente';
20+
$lang['list_paging_last'] = 'Último';
21+
$lang['list_loading'] = 'Cargando...';
22+
23+
$lang['form_edit'] = 'Editar';
24+
$lang['form_back_to_list'] = 'Volver a la lista';
25+
$lang['form_update_changes'] = 'Actualizar cambios';
26+
$lang['form_cancel'] = 'Cancelar';
27+
$lang['form_update_loading'] = 'Cargando, actualizando cambios...';
28+
$lang['update_success_message'] = 'Los datos fueron actualizados correctamente.';
29+
$lang['form_go_back_to_list'] = 'Volver a la lista';
30+
31+
$lang['form_add'] = 'Agregar';
32+
$lang['insert_success_message'] = 'Los datos han sido guardados correctamente.';
33+
$lang['form_or'] = 'o';
34+
$lang['form_save'] = 'Guardar';
35+
$lang['form_insert_loading'] = 'Cargando, guardando los datos...';
36+
37+
$lang['form_upload_a_file'] = 'Subir un archivo';
38+
$lang['form_upload_delete'] = 'borrar';
39+
$lang['form_button_clear'] = 'Resetear';
40+
41+
$lang['delete_success_message'] = 'Los datos fueron borrados de la base de datos.';
42+
$lang['delete_error_message'] = 'Los datos NO fueron borrados de la base de datos.';
43+
44+
/* Javascript messages */
45+
$lang['alert_add_form'] = 'Los datos que intentás agregar no se guardaron.\\n¿Estás seguro de que querés volver a la lista?';
46+
$lang['alert_edit_form'] = 'Los datos que intentás actualizar no se guardaron.\\n¿Estas seguro de que querés volver a la lista?';
47+
$lang['alert_delete'] = '¿Esta seguro de que querés borrar este registro?';
48+
49+
$lang['insert_error'] = 'Ocurrió un error al agregar.';
50+
$lang['update_error'] = 'Ocurrió un error al actualizar.';
51+
52+
/* Added in version 1.2.1 */
53+
$lang['set_relation_title'] = 'Seleccionar {field_display_as}';
54+
$lang['list_record'] = 'Registro';
55+
$lang['form_inactive'] = 'inactivo';
56+
$lang['form_active'] = 'activo';
57+
58+
/* Added in version 1.2.2 */
59+
$lang['form_save_and_go_back'] = 'Guardar y volver a la lista';
60+
$lang['form_update_and_go_back']= 'Actualizar y volver a la lista';
61+
62+
/* Upload functionality */
63+
$lang['string_delete_file'] = "Eliminando archivo";
64+
$lang['string_progress'] = "Progreso: ";
65+
$lang['error_on_uploading'] = "Ha ocurrido un error al intentar subir el archivo.";
66+
$lang['message_prompt_delete_file'] = "¿Estás seguro de que querés eliminar este archivo?";
67+
68+
$lang['error_max_number_of_files'] = "Solo podés subir un archivo a la vez.";
69+
$lang['error_accept_file_types'] = "No se permite este tipo de extensión.";
70+
$lang['error_max_file_size'] = "El archivo excede el tamaño máximo que fue especificado: {max_file_size}.";
71+
$lang['error_min_file_size'] = "No podés subir un archivo vacío.";
72+
73+
/* Added in version 1.3.1 */
74+
$lang['list_export'] = "Exportar";
75+
$lang['list_print'] = "Imprimir";
76+
$lang['minimize_maximize'] = 'Minimizar/Maximizar';
77+
/* Added in version 1.4 */
78+
$lang['list_view'] = 'Ver';
79+
80+
/* Added in version 1.5.1 */
81+
$lang['ui_day'] = 'dd';
82+
$lang['ui_month'] = 'mm';
83+
$lang['ui_year'] = 'yyyy';
84+
85+
/* Added in version 1.5.2 */
86+
$lang['list_more'] = 'Más';
87+
88+
/* Added in version 1.5.6 */
89+
$lang['list_search_column'] = 'Buscar por {column_name}';
90+
91+
/* Added in version 1.5.8 */
92+
$lang['alert_delete_multiple'] = '¿Estás seguro de que querés eliminar esos {items_amount} elementos?';
93+
94+
$lang['alert_delete_multiple_one'] = '¿Estás seguro de que querés eliminar este elemento?';
95+
96+
97+
/* Added in version 1.6.1 */
98+
$lang['list_clone'] = 'Clonar';
99+

‎assets/grocery_crud/languages/spanish.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,5 +96,5 @@
9696

9797

9898
/* Added in version 1.6.1 */
99-
$lang['list_clone'] = 'Clonar';
99+
$lang['list_clone'] = 'Duplicar';
100100

‎change_log.txt‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,12 @@
1+
v1.6.3
2+
- #465: Translation for Spanish Uruguay by @mlopezcoria
13
v 1.6.2
24
- #442: Searching in grid with value 0 is not working
5+
- #458: Updated Lithuanian language by @dgvirtual
6+
- #463: Updated Spanish language by @CarlosPinedaT
7+
- Security fix
38
v 1.6.1
4-
- #441 Adding clone functionality - contribution from @portapipe
9+
- #441: Adding clone functionality - contribution from @portapipe
510
v 1.6.0
611
- #211: Bug if use where clause and try to "search all" the fields
712
- #432: Bootstrap Theme issues with filtering when we are using set_relation with multiple fields

0 commit comments

Comments
 (0)