Skip to content

Issue #2140 has been fixed. #2208

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 26, 2025
+11 −2
Merged

Issue #2140 has been fixed. #2208

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion packages/Webkul/Admin/src/DataGrids/Mail/EmailDataGrid.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,9 @@ public function prepareMassActions(): void

$this->addMassAction([
'icon' => 'icon-delete',
'title' => trans('admin::app.mail.index.datagrid.delete'),
'title' => request('route') == 'trash'
? trans('admin::app.mail.index.datagrid.delete')
: trans('admin::app.mail.index.datagrid.move-to-trash'),
'method' => 'POST',
'url' => route('admin.mail.mass_delete', [
'type' => request('route') == 'trash'
Expand Down
1 change: 1 addition & 0 deletions packages/Webkul/Admin/src/Resources/lang/ar/app.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1799,6 +1799,7 @@
'attachments' => 'المرفقات',
'date' => 'التاريخ',
'move-to-inbox' => 'نقل إلى البريد الوارد',
'move-to-trash' => 'تم النقل إلى سلة المهملات',
'edit' => 'تعديل',
'view' => 'عرض',
'delete' => 'حذف',
Expand Down
1 change: 1 addition & 0 deletions packages/Webkul/Admin/src/Resources/lang/en/app.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1801,6 +1801,7 @@
'attachments' => 'Attachments',
'date' => 'Date',
'move-to-inbox' => 'Moved To Inbox',
'move-to-trash' => 'Moved To Trash',
'edit' => 'Edit',
'view' => 'View',
'delete' => 'Delete',
Expand Down
1 change: 1 addition & 0 deletions packages/Webkul/Admin/src/Resources/lang/es/app.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1802,6 +1802,7 @@
'attachments' => 'Archivos adjuntos',
'date' => 'Fecha',
'move-to-inbox' => 'Mover a la bandeja de entrada',
'move-to-trash' => 'Movido a la papelera',
'edit' => 'Editar',
'view' => 'Ver',
'delete' => 'Eliminar',
Expand Down
1 change: 1 addition & 0 deletions packages/Webkul/Admin/src/Resources/lang/fa/app.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1803,6 +1803,7 @@
'attachments' => 'پیوست‌ها',
'date' => 'تاریخ',
'move-to-inbox' => 'انتقال به صندوق ورودی',
'move-to-trash' => 'به سطل زباله منتقل شد',
'edit' => 'ویرایش',
'view' => 'نمایش',
'delete' => 'حذف',
Expand Down
1 change: 1 addition & 0 deletions packages/Webkul/Admin/src/Resources/lang/pt_BR/app.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1689,6 +1689,7 @@
'tag-name' => 'Nome da Tag',
'created-at' => 'Criado Em',
'move-to-inbox' => 'Movido para Caixa de Entrada',
'move-to-trash' => 'Movido para a lixeira',
'edit' => 'Editar',
'view' => 'Visualizar',
'delete' => 'Excluir',
Expand Down
1 change: 1 addition & 0 deletions packages/Webkul/Admin/src/Resources/lang/tr/app.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1803,6 +1803,7 @@
'content' => 'Eklentiler',
'date' => 'Tarih',
'move-to-inbox' => 'Gelen Kutusuna Taşı',
'move-to-trash' => 'Çöp kutusuna taşındı',
'edit' => 'Düzenle',
'view' => 'Görüntüle',
'delete' => 'Sil',
Expand Down
1 change: 1 addition & 0 deletions packages/Webkul/Admin/src/Resources/lang/vi/app.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1697,6 +1697,7 @@
'attachments' => 'Tệp đính kèm',
'date' => 'Ngày',
'move-to-inbox' => 'Di chuyển vào hộp thư đến',
'move-to-trash' => 'Đã chuyển vào thùng rác',
'edit' => 'Chỉnh sửa',
'view' => 'Xem',
'delete' => 'Xóa',
Expand Down
2 changes: 1 addition & 1 deletion ...ebkul/Contact/src/Database/Migrations/2024_09_09_112201_add_unique_id_to_person_table.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ public function up(): void
$table->string('unique_id')->nullable()->unique();
});

$tableName = DB::getTablePrefix() . 'persons';
$tableName = DB::getTablePrefix().'persons';

DB::statement("
UPDATE {$tableName}
Expand Down
Loading