diff --git a/datamodels/2.x/combodo-data-feature-removal/dictionaries/en.dict.combodo-data-feature-removal.php b/datamodels/2.x/combodo-data-feature-removal/dictionaries/en.dict.combodo-data-feature-removal.php index 104eec5cf..5876f3afe 100644 --- a/datamodels/2.x/combodo-data-feature-removal/dictionaries/en.dict.combodo-data-feature-removal.php +++ b/datamodels/2.x/combodo-data-feature-removal/dictionaries/en.dict.combodo-data-feature-removal.php @@ -24,6 +24,11 @@ Dict::Add('EN US', 'English', 'English', [ 'DataFeatureRemoval:Analysis:Title' => 'Analysis result', 'DataFeatureRemoval:Analysis:SubTitle' => '%1$s element(s) to clean before continuing', + 'DataFeatureRemoval:DeletionPlan:Title' => 'Deletion plan', + 'DataFeatureRemoval:DeletionPlan:SubTitle' => 'Database tables to clean before continuing', + 'DataFeatureRemoval:DoDeletion:Title' => 'Do deletion', + 'DataFeatureRemoval:DoDeletion:SubTitle' => 'Remove all the entries from the database', + 'DataFeatureRemoval:Table:Analysis:ClassName' => 'Element to remove', 'DataFeatureRemoval:Table:Analysis:RemovalType' => 'Type of element', 'DataFeatureRemoval:Table:Analysis:FeatureName' => 'Feature name', @@ -41,4 +46,12 @@ Dict::Add('EN US', 'English', 'English', [ 'DataFeatureRemoval:Table:Analysis:RemovalType:FINAL_CLASS' => 'Final class', 'DataFeatureRemoval:Table:Empty' => 'No data to remove', + + 'DataFeatureRemoval:Column:Class' => 'Class', + 'DataFeatureRemoval:Column:DeleteCount' => 'Delete count', + 'DataFeatureRemoval:Column:UpdateCount' => 'Update count', + 'DataFeatureRemoval:Column:Issue' => 'Issue', + + 'DataFeatureRemoval:Column:DeletedCount' => 'Deleted entries', + 'DataFeatureRemoval:Column:UpdatedCount' => 'Updated entries', ]); diff --git a/datamodels/2.x/combodo-data-feature-removal/dictionaries/fr.dict.combodo-data-feature-removal.php b/datamodels/2.x/combodo-data-feature-removal/dictionaries/fr.dict.combodo-data-feature-removal.php index 2a2a6ff61..bb825f2e0 100644 --- a/datamodels/2.x/combodo-data-feature-removal/dictionaries/fr.dict.combodo-data-feature-removal.php +++ b/datamodels/2.x/combodo-data-feature-removal/dictionaries/fr.dict.combodo-data-feature-removal.php @@ -24,6 +24,11 @@ Dict::Add('FR FR', 'French', 'Français', [ 'DataFeatureRemoval:Analysis:Title' => 'Analysis result', 'DataFeatureRemoval:Analysis:SubTitle' => '%1$s element(s) to clean before continuing', + 'DataFeatureRemoval:DeletionPlan:Title' => 'Deletion plan', + 'DataFeatureRemoval:DeletionPlan:SubTitle' => 'Database tables to clean before continuing', + 'DataFeatureRemoval:DoDeletion:Title' => 'Do deletion', + 'DataFeatureRemoval:DoDeletion:SubTitle' => 'Remove all the entries from the database', + 'DataFeatureRemoval:Table:Analysis:ClassName' => 'Element to remove', 'DataFeatureRemoval:Table:Analysis:RemovalType' => 'Type of element', 'DataFeatureRemoval:Table:Analysis:FeatureName' => 'Feature name', @@ -41,4 +46,12 @@ Dict::Add('FR FR', 'French', 'Français', [ 'DataFeatureRemoval:Table:Analysis:RemovalType:FINAL_CLASS' => 'Final class', 'DataFeatureRemoval:Table:Empty' => 'No data to remove', + + 'DataFeatureRemoval:Column:Class' => 'Class', + 'DataFeatureRemoval:Column:DeleteCount' => 'Delete count', + 'DataFeatureRemoval:Column:UpdateCount' => 'Update count', + 'DataFeatureRemoval:Column:Issue' => 'Issue', + + 'DataFeatureRemoval:Column:DeletedCount' => 'Deleted entries', + 'DataFeatureRemoval:Column:UpdatedCount' => 'Updated entries', ]); diff --git a/datamodels/2.x/combodo-data-feature-removal/src/Controller/DataFeatureRemovalController.php b/datamodels/2.x/combodo-data-feature-removal/src/Controller/DataFeatureRemovalController.php index 68b424eaf..3e1278755 100644 --- a/datamodels/2.x/combodo-data-feature-removal/src/Controller/DataFeatureRemovalController.php +++ b/datamodels/2.x/combodo-data-feature-removal/src/Controller/DataFeatureRemovalController.php @@ -164,7 +164,7 @@ HTML, $aNewColumns = []; foreach ($aColumns as $sColumn) { - $aNewColumns[] = ['label' => Dict::S("DataFeatureRemoval:Table:$sTableName:$sColumn", $sColumn)]; + $aNewColumns[] = ['label' => Dict::S("DataFeatureRemoval:Table:$sTableName:$sColumn", Dict::S("DataFeatureRemoval:Column:$sColumn", $sColumn))]; } $aColumns = $aNewColumns; @@ -229,7 +229,7 @@ HTML, $aClasses = utils::ReadPostedParam('classes', null, utils::ENUM_SANITIZATION_FILTER_CLASS); $aDeletionExecutionSummary = DeletionPlanService::GetInstance()->ExecuteDeletionPlan($aClasses); - $aColumns = ['Class', 'DeleteCount' , 'UpdateCount']; + $aColumns = ['Class', 'DeletedCount' , 'UpdatedCount']; $aRows = []; foreach ($aDeletionExecutionSummary as $oDeletionExecutionSummaryEntity) { $aRows[] = [