From f31e7df4ce63b2b429a56c4ced71a3a30d5eec0d Mon Sep 17 00:00:00 2001 From: "lenaick.moreira" Date: Fri, 17 Jul 2026 10:35:59 +0200 Subject: [PATCH] =?UTF-8?q?N=C2=B09565=20-=20Extension=20Mgmt=20:=20displa?= =?UTF-8?q?y=20progression=20during=20analysis?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../en.dict.combodo-data-feature-removal.php | 8 ++++++++ .../fr.dict.combodo-data-feature-removal.php | 8 ++++++++ .../templates/AjaxCompile.html.twig | 2 -- .../templates/AnalysisResult.ready.js.twig | 11 +++++++---- 4 files changed, 23 insertions(+), 6 deletions(-) delete mode 100644 datamodels/2.x/combodo-data-feature-removal/templates/AjaxCompile.html.twig 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 9b02bc1c8d..630f4faf26 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 @@ -40,6 +40,14 @@ Dict::Add('EN US', 'English', 'English', [ 'DataFeatureRemoval:CleanupComplete:Title' => 'All clear.', 'DataFeatureRemoval:CompilComplete' => 'Compilation successful. No Cleanup needed. You can proceed to setup.', + 'DataFeatureRemoval:Compile:InProgress' => 'Compilation in progress...', + 'DataFeatureRemoval:Compile:Success' => 'Compilation successful', + 'DataFeatureRemoval:Compile:Error' => 'Compilation error', + + 'DataFeatureRemoval:RunAudit:InProgress' => 'Analysis in progress...', + 'DataFeatureRemoval:RunAudit:Success' => 'Analysis completed', + 'DataFeatureRemoval:RunAudit:Error' => 'Error during analysis', + 'UI:Button:Analyze' => 'Analyze', 'UI:Button:ModifyChoices' => 'Change my selection', 'UI:Button:AnalyzeAndSetup' => 'Analyze and go to setup', 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 7c2c7863da..ed025cd3fa 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 @@ -40,6 +40,14 @@ Dict::Add('FR FR', 'French', 'Français', [ 'DataFeatureRemoval:CleanupComplete:Title' => 'All clear.', 'DataFeatureRemoval:CompilComplete' => 'Compilation successful. No Cleanup needed. You can proceed to setup.', + 'DataFeatureRemoval:Compile:InProgress' => 'Compilation en cours...', + 'DataFeatureRemoval:Compile:Success' => 'Compilation terminée', + 'DataFeatureRemoval:Compile:Error' => 'Erreur lors de la compilation', + + 'DataFeatureRemoval:RunAudit:InProgress' => 'Analyse en cours...', + 'DataFeatureRemoval:RunAudit:Success' => 'Analyse terminée', + 'DataFeatureRemoval:RunAudit:Error' => 'Erreur lors de l\'analyse', + 'UI:Button:Analyze' => 'Analyser', 'UI:Button:ModifyChoices' => 'Modifier la sélection', 'UI:Button:AnalyzeAndSetup' => 'Analyser et ouvrir l’assistant de configuration', diff --git a/datamodels/2.x/combodo-data-feature-removal/templates/AjaxCompile.html.twig b/datamodels/2.x/combodo-data-feature-removal/templates/AjaxCompile.html.twig deleted file mode 100644 index d256868cff..0000000000 --- a/datamodels/2.x/combodo-data-feature-removal/templates/AjaxCompile.html.twig +++ /dev/null @@ -1,2 +0,0 @@ -{# @copyright Copyright (C) 2010-2026 Combodo SARL #} -{# @license http://opensource.org/licenses/AGPL-3.0 #} diff --git a/datamodels/2.x/combodo-data-feature-removal/templates/AnalysisResult.ready.js.twig b/datamodels/2.x/combodo-data-feature-removal/templates/AnalysisResult.ready.js.twig index 70c9a33b1a..47fa4ba20c 100644 --- a/datamodels/2.x/combodo-data-feature-removal/templates/AnalysisResult.ready.js.twig +++ b/datamodels/2.x/combodo-data-feature-removal/templates/AnalysisResult.ready.js.twig @@ -1,7 +1,6 @@ {# @copyright Copyright (C) 2010-2026 Combodo SARL #} {# @license http://opensource.org/licenses/AGPL-3.0 #} - function ajax_run_audit() { $('#ajax_run_audit_in_progress_msg').removeClass('ibo-is-hidden'); $.post( @@ -18,7 +17,11 @@ function ajax_run_audit() { $('#ajax_run_audit').html(data); } } - ); + ) + .fail(function() { + $('#ajax_run_audit_error_msg .ibo-alert--title').html('{{ 'DataFeatureRemoval:RunAudit:Error'|dict_s }}'); + $('#ajax_run_audit_error_msg').removeClass('ibo-is-hidden'); + }); } function ajax_compile() { @@ -43,9 +46,9 @@ function ajax_compile() { 'json' ) .fail(function() { - $('#ajax_compile_error_msg .ibo-alert--title').html('{{ 'DataFeatureRemoval:Ajax:Error'|dict_s }}'); + $('#ajax_compile_error_msg .ibo-alert--title').html('{{ 'DataFeatureRemoval:Compile:Error'|dict_s }}'); $('#ajax_compile_error_msg').removeClass('ibo-is-hidden'); }); } -ajax_compile(); \ No newline at end of file +ajax_compile();