Fixes: #4817@0.35; Translations changed, Specs adpated to new translation param name

4 files changed, 6 insertions, 7 deletions

diff --git a/app/workers/workbench_import_worker.rb b/app/workers/workbench_import_worker.rb
index 300fad9e2..2e4f7c1e5 100644
--- a/app/workers/workbench_import_worker.rb
+++ b/app/workers/workbench_import_worker.rb
@@ -35,7 +35,7 @@ class WorkbenchImportWorker
   end
 
   def handle_corrupt_zip_file
-    @workbench_import.messages.create(criticity: :error, message_key: 'corrupt_zip_file', message_attributes: {import_name: @workbench_import.name})
+    @workbench_import.messages.create(criticity: :error, message_key: 'corrupt_zip_file', message_attributes: {source_filename: @workbench_import.name})
   end
 
   def upload zip_service
diff --git a/config/locales/import_messages.en.yml b/config/locales/import_messages.en.yml
index 2048b9794..bf6b45020 100644
--- a/config/locales/import_messages.en.yml
+++ b/config/locales/import_messages.en.yml
@@ -1,8 +1,8 @@
 en:
   import_messages:
     compliance_check_messages:
-      corrupt_zip_file: "The zip file of WorkbenchImport %{import_name} is corrupted and cannot be read"
-      inconsistent_zip_file: "The zip file of WorkbenchImport %{import_name} contains the following spurious directories %{spurious_dirs}, which are ignored"
+      corrupt_zip_file: "The zip file %{source_filename} is corrupted and cannot be read"
+      inconsistent_zip_file: "The zip file %{source_filename} contains unexpected directories: %{spurious_dirs}, which are ignored"
       referential_creation: "Le référentiel n'a pas pu être créé car un référentiel existe déjà sur les même périodes et lignes"
       1_netexstif_2: "Le fichier %{source_filename} ne respecte pas la syntaxe XML ou la XSD NeTEx : erreur '%{error_value}' rencontré"
       1_netexstif_5: "%{source_filename}-Ligne %{source_line_number}-Colonne %{source_column_number} : l'objet %{source_label} d'identifiant %{source_objectid} a une date de mise à jour dans le futur"
diff --git a/config/locales/import_messages.fr.yml b/config/locales/import_messages.fr.yml
index 9f0af1faa..7d3bbf23b 100644
--- a/config/locales/import_messages.fr.yml
+++ b/config/locales/import_messages.fr.yml
@@ -1,8 +1,8 @@
 fr:
   import_messages:
     compliance_check_messages:
-      corrupt_zip_file: "Le fichier zip du WorkbenchImport %{import_name} est corrompu, et ne peut être lu" 
-      inconsistent_zip_file: "Le fichier zip du WorkbenchImport %{import_name} contient les repertoirs illegeaux %{spurious_dirs} qui seront ignorés"
+      corrupt_zip_file: "Le fichier zip %{source_filename} est corrompu, et ne peut être lu"
+      inconsistent_zip_file: "Le fichier zip %{source_filename} contient des repertoires non prévus : %{spurious_dirs} qui seront ignorés"
       referential_creation: "Le référentiel n'a pas pu être créé car un référentiel existe déjà sur les même périodes et lignes"
       1_netexstif_2: "Le fichier %{source_filename} ne respecte pas la syntaxe XML ou la XSD NeTEx : erreur '%{error_value}' rencontré"
       1_netexstif_5: "%{source_filename}-Ligne %{source_line_number}-Colonne %{source_column_number} : l'objet %{source_label} d'identifiant %{source_objectid} a une date de mise à jour dans le futur"
diff --git a/spec/workers/workbench_import/workbench_import_with_corrupt_zip_spec.rb b/spec/workers/workbench_import/workbench_import_with_corrupt_zip_spec.rb
index 5e34b208a..48c2a4bcc 100644
--- a/spec/workers/workbench_import/workbench_import_with_corrupt_zip_spec.rb
+++ b/spec/workers/workbench_import/workbench_import_with_corrupt_zip_spec.rb
@@ -1,6 +1,5 @@
 RSpec.describe WorkbenchImportWorker do
 
-
   shared_examples_for 'corrupt zipfile data' do
     subject { described_class.new }
     let( :workbench_import ){ create :workbench_import, status: :pending }
@@ -23,7 +22,7 @@ RSpec.describe WorkbenchImportWorker do
       message = workbench_import.messages.last
       expect( message.criticity ).to eq('error')
       expect( message.message_key ).to eq('corrupt_zip_file')
-      expect( message.message_attributes ).to eq( 'import_name' => workbench_import.name )
+      expect( message.message_attributes ).to eq( 'source_filename' => workbench_import.name )
     end
 
     it 'does not change current step' do