From 60624d40cfad5945b9b2eb4c4f8739ab6e357040 Mon Sep 17 00:00:00 2001 From: Sevan Nerse Date: Wed, 23 Jun 2021 12:12:07 +0300 Subject: [PATCH 1/2] module history description is fixed #mz7u2p --- app/Abstracts/Commands/Module.php | 2 +- resources/lang/en-GB/modules.php | 12 +++++++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/app/Abstracts/Commands/Module.php b/app/Abstracts/Commands/Module.php index b41e7b79a..234f1ccff 100644 --- a/app/Abstracts/Commands/Module.php +++ b/app/Abstracts/Commands/Module.php @@ -57,7 +57,7 @@ abstract class Module extends Command 'company_id' => $this->company_id, 'module_id' => $this->model->id, 'version' => $this->module->get('version'), - 'description' => trans('modules.' . $action, ['module' => $this->alias]), + 'description' => trans('modules.history.' . $action, ['module' => $this->alias]), ]); } diff --git a/resources/lang/en-GB/modules.php b/resources/lang/en-GB/modules.php index 95a815669..1f0e79671 100644 --- a/resources/lang/en-GB/modules.php +++ b/resources/lang/en-GB/modules.php @@ -25,11 +25,13 @@ return [ 'view' => 'View', 'back' => 'Back', - 'installed' => ':module installed', - 'uninstalled' => ':module uninstalled', - //'updated' => ':module updated', - 'enabled' => ':module enabled', - 'disabled' => ':module disabled', + 'history' => [ + 'installed' => ':module installed', + 'uninstalled' => ':module uninstalled', + 'updated' => ':module updated', + 'enabled' => ':module enabled', + 'disabled' => ':module disabled', + ], 'tab' => [ 'installation' => 'Installation', From 60b570bd578bdfb7ab2e93adb48d105a85123a0c Mon Sep 17 00:00:00 2001 From: Sevan Nerse Date: Fri, 25 Jun 2021 12:05:59 +0300 Subject: [PATCH 2/2] arrangement after review for module history description #mz7u2p --- app/Abstracts/Commands/Module.php | 2 +- app/Listeners/Update/CreateModuleUpdatedHistory.php | 2 +- resources/lang/en-GB/modules.php | 12 +++++------- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/app/Abstracts/Commands/Module.php b/app/Abstracts/Commands/Module.php index 234f1ccff..b41e7b79a 100644 --- a/app/Abstracts/Commands/Module.php +++ b/app/Abstracts/Commands/Module.php @@ -57,7 +57,7 @@ abstract class Module extends Command 'company_id' => $this->company_id, 'module_id' => $this->model->id, 'version' => $this->module->get('version'), - 'description' => trans('modules.history.' . $action, ['module' => $this->alias]), + 'description' => trans('modules.' . $action, ['module' => $this->alias]), ]); } diff --git a/app/Listeners/Update/CreateModuleUpdatedHistory.php b/app/Listeners/Update/CreateModuleUpdatedHistory.php index 5f28ee7b4..c65b9ad8f 100644 --- a/app/Listeners/Update/CreateModuleUpdatedHistory.php +++ b/app/Listeners/Update/CreateModuleUpdatedHistory.php @@ -34,7 +34,7 @@ class CreateModuleUpdatedHistory 'company_id' => $model->company_id, 'module_id' => $model->id, 'version' => $event->new, - 'description' => trans('modules.history.updated', ['module' => $module->getAlias()]), + 'description' => trans('modules.updated_2', ['module' => $module->getAlias()]), ]); } } diff --git a/resources/lang/en-GB/modules.php b/resources/lang/en-GB/modules.php index 1f0e79671..8634a56d5 100644 --- a/resources/lang/en-GB/modules.php +++ b/resources/lang/en-GB/modules.php @@ -25,13 +25,11 @@ return [ 'view' => 'View', 'back' => 'Back', - 'history' => [ - 'installed' => ':module installed', - 'uninstalled' => ':module uninstalled', - 'updated' => ':module updated', - 'enabled' => ':module enabled', - 'disabled' => ':module disabled', - ], + 'installed' => ':module installed', + 'uninstalled' => ':module uninstalled', + 'updated_2' => ':module updated', + 'enabled' => ':module enabled', + 'disabled' => ':module disabled', 'tab' => [ 'installation' => 'Installation',