Merge pull request #1613 from dalmanza2001/v5.5

Correction Location "es" and add filter_empty_or_null in table.blade.php
crocodic-studio · Nov 4, 2020 · 02ed62c · 02ed62c
2 parents 2152a74 + 0738c68
commit 02ed62c
Show file tree

Hide file tree

Showing 8 changed files with 28 additions and 23 deletions.
diff --git a/src/localization/ar/crudbooster.php b/src/localization/ar/crudbooster.php
@@ -203,6 +203,7 @@
     'filter_in' => 'ضمن',
     'filter_not_in' => 'ليس ضمن',
     'filter_between' => 'بين',
+    'filter_empty_or_null' => 'Empty ( or Null)',
     'filter_sort_ascending' => 'فرز تصاعدي',
     'filter_sort_descending' => 'فرز تنازلي',
     'filter_eg' => 'مثال',
@@ -244,7 +245,7 @@
     'datamodal_browse_data' => 'استعراض البيانات',
     'datamodal_browse_file' => 'استعراض الملف',
 
-    //child 
+    //child
     'table_detail' => 'تفاصيل الجدول',
     'your_file_size_is_too_big' => 'حجم الملف كبير جدا',
     'save_changes' => 'حفظ التغييرات',

diff --git a/src/localization/en/crudbooster.php b/src/localization/en/crudbooster.php
@@ -193,7 +193,7 @@
     'email_setting' => 'Email Setting',
     'application_setting' => 'Application Setting',
 
-    // table filter & sort 
+    // table filter & sort
     'filter_select_operator_type' => 'Select Operator Type',
     'filter_ascending' => 'ASCENDING',
     'filter_descending' => 'DESCENDING',
@@ -208,6 +208,7 @@
     'filter_in' => 'IN',
     'filter_not_in' => 'NOT IN',
     'filter_between' => 'BETWEEN',
+    'filter_empty_or_null' => 'Empty ( or Null)',
     'filter_sort_ascending' => 'Sort ascending',
     'filter_sort_descending' => 'Sort Descending',
     'filter_eg' => 'e.g',
@@ -251,14 +252,14 @@
     'privileges_module_list_update' => 'Update',
     'privileges_module_list_delete' => 'Delete',
 
-    //datamodal 
+    //datamodal
     'datamodal_select' => 'Select',
     'datamodal_search_and_enter' => 'Search and enter...',
     'datamodal_enter_to_search' => 'Enter to search',
     'datamodal_browse_data' => 'Browse Data',
     'datamodal_browse_file' => 'Browse File',
 
-    //child 
+    //child
     'table_detail' => 'Table Detail',
     'your_file_size_is_too_big' => 'Your file size is too big',
     'save_changes' => 'Save Changes',

diff --git a/src/localization/es/crudbooster.php b/src/localization/es/crudbooster.php
@@ -181,7 +181,7 @@
     'login_register_style' => 'Estilo de página de registro',
     'email_setting' => 'Ajustes de Correo',
     'application_setting' => 'Ajustes de Aplicaciones',
-    // table filter & sort 
+    // table filter & sort
     'filter_select_operator_type' => 'Selecciona el tipo de operador',
     'filter_ascending' => 'Ascendentemente',
     'filter_descending' => 'Descendentemente',
@@ -192,10 +192,11 @@
     'filter_less_than_or_equal' => '<= (Menor o Igual que)',
     'filter_less_than' => '< (Menor que)',
     'filter_greater_than' => '> (Mayor que)',
-    'filter_not_equal_to' => '!= (Deferente de)',
+    'filter_not_equal_to' => '!= (Diferente de)',
     'filter_in' => 'Incluye',
     'filter_not_in' => 'No Incluye',
     'filter_between' => 'Entre',
+    'filter_empty_or_null' => 'Empty ( or Null)',
     'filter_sort_ascending' => 'Ordenar Ascendentemente',
     'filter_sort_descending' => 'Ordenar Descendentemente',
     'filter_eg' => 'Ej.:',
@@ -204,7 +205,7 @@
     'filter_search' => 'Buscar',
     'filter_from' => 'Desde',
     'filter_to' => 'Hasta',
-    'filter_sorting' => 'Sorting',
+    'filter_sorting' => '** Ordenando',
     'filter_rows_total' => 'Total de registros',
     'filter_rows_to' => 'a',
     'filter_rows_of' => 'de',
@@ -245,7 +246,7 @@
 
     'datamodal_browse_file' => 'Escoger Archivo',
 
-    //child 
+    //child
     'table_detail' => 'Tabla de Detalles',
     'your_file_size_is_too_big' => 'El tamaño del archivo es demasiado grande',
     'save_changes' => 'Guardar Cambios',

diff --git a/src/localization/id/crudbooster.php b/src/localization/id/crudbooster.php
@@ -190,7 +190,7 @@
     'email_setting' => 'Pengaturan Email',
     'application_setting' => 'Pengaturan Aplikasi',
 
-    // table filter & sort 
+    // table filter & sort
     'filter_select_operator_type' => 'Operator',
     'filter_ascending' => 'Kecil -> Besar',
     'filter_descending' => 'Besar <- Kecil',
@@ -205,6 +205,7 @@
     'filter_in' => 'Dalam pilihan',
     'filter_not_in' => 'Tidak dalam pilihan',
     'filter_between' => 'Diantara',
+    'filter_empty_or_null' => 'Empty ( or Null)',
     'filter_sort_ascending' => 'Urutan Naik',
     'filter_sort_descending' => 'Urutan Turun',
     'filter_eg' => 'Cth',
@@ -244,14 +245,14 @@
     'privileges_module_list_update' => 'Update',
     'privileges_module_list_delete' => 'Delete',
 
-    //datamodal 
+    //datamodal
     'datamodal_select' => 'Select',
     'datamodal_search_and_enter' => 'Search and enter...',
     'datamodal_enter_to_search' => 'Enter to search',
     'datamodal_browse_data' => 'Browse Data',
     'datamodal_browse_file' => 'Browse File',
 
-    //child 
+    //child
     'table_detail' => 'Table Detail',
     'your_file_size_is_too_big' => 'Your file size is too big',
     'save_changes' => 'Save Changes',

diff --git a/src/localization/pt_br/crudbooster.php b/src/localization/pt_br/crudbooster.php
@@ -28,9 +28,9 @@
     'message_forgot_password' => 'Enviamos nova senha para seu e-mail, verifique a caixa de entrada ou de spam!',
     'page_not_found' => 'Oops! Página não encontrada',
     'page_not_found_text' => 'Não foi possível pesquisar na página que você está procurando.',
-    'page_not_found_tips' => '* Verifique se o URL está correto<br/> 
-                * Certifique-se de que a capitalização correta, pois é sensível a maiúsculas e minúsculas<br/> 
-                * Talvez a página que você está procurando tenha sido excluída pelo Administrador<br/> 
+    'page_not_found_tips' => '* Verifique se o URL está correto<br/>
+                * Certifique-se de que a capitalização correta, pois é sensível a maiúsculas e minúsculas<br/>
+                * Talvez a página que você está procurando tenha sido excluída pelo Administrador<br/>
                 * Você pode voltar clicando no botão Voltar no navegador<br/>',
     'log_try_view' => 'Tente visualizar o conteúdo de :name em :module',
     'log_try_edit' => 'Tente editar o conteúdo de :name em :module',
@@ -190,6 +190,7 @@
     'filter_in' => 'IN',
     'filter_not_in' => 'NOT IN',
     'filter_between' => 'BETWEEN',
+    'filter_empty_or_null' => 'Empty ( or Null)',
     'filter_sort_ascending' => 'Ordernação ascendente',
     'filter_sort_descending' => 'Ordernação descendente',
     'filter_eg' => 'ex.',
@@ -237,7 +238,7 @@
     'datamodal_browse_data' => 'Browse Data',
     'datamodal_browse_file' => 'Browse File',
 
-    //child 
+    //child
     'table_detail' => 'Table Detail',
     'your_file_size_is_too_big' => 'Your file size is too big',
     'save_changes' => 'Save Changes',

diff --git a/src/localization/tr/crudbooster.php b/src/localization/tr/crudbooster.php
@@ -192,7 +192,7 @@
     'email_setting' => 'Email Ayarları',
     'application_setting' => 'Uygulama Ayarları',
 
-    // table filter & sort 
+    // table filter & sort
     'filter_select_operator_type' => 'Karşılaştırma Türü Seçiniz',
     'filter_ascending' => 'ARTAN',
     'filter_descending' => 'AZALAN',
@@ -207,6 +207,7 @@
     'filter_in' => 'İçeriyorsa',
     'filter_not_in' => 'İçermiyorsa',
     'filter_between' => 'Arasında',
+    'filter_empty_or_null' => 'Empty ( or Null)',
     'filter_sort_ascending' => 'Artan Sıralama',
     'filter_sort_descending' => 'Azalan Sıralama',
     'filter_eg' => 'örnek ',
@@ -253,7 +254,7 @@
     'datamodal_browse_data' => 'Gözat',
     'datamodal_browse_file' => 'Dosyaya Gözat',
 
-    //child 
+    //child
     'table_detail' => 'Tablo ',
     'your_file_size_is_too_big' => 'Dosya boyutu büyük.',
     'save_changes' => 'Değişikleri Kaydet',

diff --git a/src/localization/zh-CN/crudbooster.php b/src/localization/zh-CN/crudbooster.php
@@ -191,7 +191,7 @@
     'email_setting' => '邮箱设置',
     'application_setting' => '应用设置',
 
-    // table filter & sort 
+    // table filter & sort
     'filter_select_operator_type' => '选择',
     'filter_ascending' => '顺序',
     'filter_descending' => '倒序',
@@ -206,6 +206,7 @@
     'filter_in' => '包含',
     'filter_not_in' => '不包含',
     'filter_between' => '日期或数字区间',
+    'filter_empty_or_null' => 'Empty ( or Null)',
     'filter_sort_ascending' => '顺序排列',
     'filter_sort_descending' => '倒序排列',
     'filter_eg' => '例如',
@@ -245,7 +246,7 @@
     'privileges_module_list_update' => '更新',
     'privileges_module_list_delete' => '删除',
 
-    //datamodal 
+    //datamodal
     'datamodal_select' => '选择',
     'datamodal_search_and_enter' => '查询并进入...',
     'datamodal_enter_to_search' => '进入查询',

diff --git a/src/views/default/table.blade.php b/src/views/default/table.blade.php
@@ -348,9 +348,7 @@ class="filter-combo form-control">
                                                     {{ (CRUDBooster::getTypeFilter($col["field_with"]) == 'not in')?"selected":"" }} value='not in'>{{cbLang("filter_not_in")}}</option>
                                             @if(in_array($col['type_data'],['date','time','datetime','int','integer','smallint','tinyint','mediumint','bigint','double','float','decimal','timestamp']))
                                                 <option {{ (CRUDBooster::getTypeFilter($col["field_with"]) == 'between')?"selected":"" }} value='between'>{{cbLang("filter_between")}}</option>@endif
-                                            <option {{ (CRUDBooster::getTypeFilter($col["field_with"]) == 'empty')?"selected":"" }} value='empty'>Empty ( or
-                                                Null)
-                                            </option>
+                                            <option {{ (CRUDBooster::getTypeFilter($col["field_with"]) == 'empty')?"selected":"" }} value='empty'>{{cbLang("filter_empty_or_null")}}</option>
                                         </select>
                                     </div><!--END COL_SM_4-->
 
@@ -397,7 +395,7 @@ class='filter-value-between form-control {{ (in_array($col["type_data"],["date",
 
                                     <div class='col-sm-2'>
                                         <select class='form-control' name='filter_column[{{$col["field_with"]}}][sorting]'>
-                                            <option value=''>** Sorting</option>
+                                            <option value=''>{{cbLang("filter_sorting")}}</option>
                                             <option {{ (CRUDBooster::getSortingFilter($col["field_with"]) == 'asc')?"selected":"" }} value='asc'>{{cbLang("filter_ascending")}}</option>
                                             <option {{ (CRUDBooster::getSortingFilter($col["field_with"]) == 'desc')?"selected":"" }} value='desc'>{{cbLang("filter_descending")}}</option>
                                         </select>