Skip to content

Commit 7c3ac9d

Browse files
committed
Issue #2140 has been fixed.
1 parent b03e64c commit 7c3ac9d

File tree

9 files changed

+11
-2
lines changed

9 files changed

+11
-2
lines changed

packages/Webkul/Admin/src/DataGrids/Mail/EmailDataGrid.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,9 @@ public function prepareMassActions(): void
198198

199199
$this->addMassAction([
200200
'icon' => 'icon-delete',
201-
'title' => trans('admin::app.mail.index.datagrid.delete'),
201+
'title' => request('route') == 'trash'
202+
? trans('admin::app.mail.index.datagrid.delete')
203+
: trans('admin::app.mail.index.datagrid.move-to-trash'),
202204
'method' => 'POST',
203205
'url' => route('admin.mail.mass_delete', [
204206
'type' => request('route') == 'trash'

packages/Webkul/Admin/src/Resources/lang/ar/app.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1799,6 +1799,7 @@
17991799
'attachments' => 'المرفقات',
18001800
'date' => 'التاريخ',
18011801
'move-to-inbox' => 'نقل إلى البريد الوارد',
1802+
'move-to-trash' => 'تم النقل إلى سلة المهملات',
18021803
'edit' => 'تعديل',
18031804
'view' => 'عرض',
18041805
'delete' => 'حذف',

packages/Webkul/Admin/src/Resources/lang/en/app.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1801,6 +1801,7 @@
18011801
'attachments' => 'Attachments',
18021802
'date' => 'Date',
18031803
'move-to-inbox' => 'Moved To Inbox',
1804+
'move-to-trash' => 'Moved To Trash',
18041805
'edit' => 'Edit',
18051806
'view' => 'View',
18061807
'delete' => 'Delete',

packages/Webkul/Admin/src/Resources/lang/es/app.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1802,6 +1802,7 @@
18021802
'attachments' => 'Archivos adjuntos',
18031803
'date' => 'Fecha',
18041804
'move-to-inbox' => 'Mover a la bandeja de entrada',
1805+
'move-to-trash' => 'Movido a la papelera',
18051806
'edit' => 'Editar',
18061807
'view' => 'Ver',
18071808
'delete' => 'Eliminar',

packages/Webkul/Admin/src/Resources/lang/fa/app.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1803,6 +1803,7 @@
18031803
'attachments' => 'پیوست‌ها',
18041804
'date' => 'تاریخ',
18051805
'move-to-inbox' => 'انتقال به صندوق ورودی',
1806+
'move-to-trash' => 'به سطل زباله منتقل شد',
18061807
'edit' => 'ویرایش',
18071808
'view' => 'نمایش',
18081809
'delete' => 'حذف',

packages/Webkul/Admin/src/Resources/lang/pt_BR/app.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1689,6 +1689,7 @@
16891689
'tag-name' => 'Nome da Tag',
16901690
'created-at' => 'Criado Em',
16911691
'move-to-inbox' => 'Movido para Caixa de Entrada',
1692+
'move-to-trash' => 'Movido para a lixeira',
16921693
'edit' => 'Editar',
16931694
'view' => 'Visualizar',
16941695
'delete' => 'Excluir',

packages/Webkul/Admin/src/Resources/lang/tr/app.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1803,6 +1803,7 @@
18031803
'content' => 'Eklentiler',
18041804
'date' => 'Tarih',
18051805
'move-to-inbox' => 'Gelen Kutusuna Taşı',
1806+
'move-to-trash' => 'Çöp kutusuna taşındı',
18061807
'edit' => 'Düzenle',
18071808
'view' => 'Görüntüle',
18081809
'delete' => 'Sil',

packages/Webkul/Admin/src/Resources/lang/vi/app.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1697,6 +1697,7 @@
16971697
'attachments' => 'Tệp đính kèm',
16981698
'date' => 'Ngày',
16991699
'move-to-inbox' => 'Di chuyển vào hộp thư đến',
1700+
'move-to-trash' => 'Đã chuyển vào thùng rác',
17001701
'edit' => 'Chỉnh sửa',
17011702
'view' => 'Xem',
17021703
'delete' => 'Xóa',

packages/Webkul/Contact/src/Database/Migrations/2024_09_09_112201_add_unique_id_to_person_table.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ public function up(): void
1616
$table->string('unique_id')->nullable()->unique();
1717
});
1818

19-
$tableName = DB::getTablePrefix() . 'persons';
19+
$tableName = DB::getTablePrefix().'persons';
2020

2121
DB::statement("
2222
UPDATE {$tableName}

0 commit comments

Comments
 (0)