From 1bd438a50965bf57e87c98990239ffea956c3352 Mon Sep 17 00:00:00 2001 From: Robert Date: Tue, 31 Oct 2017 10:41:14 +0100 Subject: Fixes: #4817@0.35; Translations changed, Specs adpated to new translation param name --- app/workers/workbench_import_worker.rb | 2 +- config/locales/import_messages.en.yml | 4 ++-- config/locales/import_messages.fr.yml | 4 ++-- .../workbench_import/workbench_import_with_corrupt_zip_spec.rb | 3 +-- 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 -- cgit v1.2.3 From f9a4e2b828f689853c19f885c3cc9f0b96211590 Mon Sep 17 00:00:00 2001 From: Robert Date: Tue, 31 Oct 2017 12:02:02 +0100 Subject: Refs: #4817@0.1h; CodeReview related fix filename instead of import name --- app/workers/workbench_import_worker.rb | 2 +- spec/workers/workbench_import/workbench_import_with_corrupt_zip_spec.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/workers/workbench_import_worker.rb b/app/workers/workbench_import_worker.rb index 2e4f7c1e5..1260f22cc 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: {source_filename: @workbench_import.name}) + @workbench_import.messages.create(criticity: :error, message_key: 'corrupt_zip_file', message_attributes: {source_filename: @workbench_import.file.file.file}) end def upload zip_service 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 48c2a4bcc..47626f5a1 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 @@ -22,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( 'source_filename' => workbench_import.name ) + expect( message.message_attributes ).to eq( 'source_filename' => workbench_import.file.file.file ) end it 'does not change current step' do -- cgit v1.2.3 From 8c3844790fb6964f520930a57c14704f4424eeb6 Mon Sep 17 00:00:00 2001 From: Guillaume Date: Tue, 31 Oct 2017 16:43:30 +0100 Subject: fix helper transport_modes for show only a transport_mode if transport_submode is not informed Refs #4812 --- app/helpers/compliance_control_blocks_helper.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/helpers/compliance_control_blocks_helper.rb b/app/helpers/compliance_control_blocks_helper.rb index 09e22d6e9..5c279b33a 100644 --- a/app/helpers/compliance_control_blocks_helper.rb +++ b/app/helpers/compliance_control_blocks_helper.rb @@ -1,10 +1,10 @@ module ComplianceControlBlocksHelper def transport_mode(transport_mode, transport_submode) - if (transport_mode) && (transport_submode) != "" - transportMode = "[" + t("enumerize.transport_mode.#{transport_mode}") + "]" + "[" + t("enumerize.transport_submode.#{transport_submode}") + "]" + return "[Tous les modes de transport]" if transport_mode == "" + if transport_submode == "" + "[" + t("enumerize.transport_mode.#{transport_mode}") + "]" else - transportMode = "[Tous les modes de transport]" + "[" + t("enumerize.transport_mode.#{transport_mode}") + "]" + "[" + t("enumerize.transport_submode.#{transport_submode}") + "]" end - transportMode end end \ No newline at end of file -- cgit v1.2.3 From db6ef457149b333e75fb2015c510fb6aa01b2572 Mon Sep 17 00:00:00 2001 From: Robert Date: Tue, 31 Oct 2017 18:24:57 +0100 Subject: Refs: #4817@0.3h; Hotfix for wrong message for spurious directories in zip file --- app/workers/workbench_import_worker.rb | 4 ++-- spec/workers/workbench_import/workbench_import_worker_spec.rb | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/workers/workbench_import_worker.rb b/app/workers/workbench_import_worker.rb index 1260f22cc..de51efded 100644 --- a/app/workers/workbench_import_worker.rb +++ b/app/workers/workbench_import_worker.rb @@ -55,8 +55,8 @@ class WorkbenchImportWorker criticity: :warning, message_key: 'inconsistent_zip_file', message_attributes: { - 'import_name' => @workbench_import.name, - 'spurious_dirs' => entry.spurious.join(', ') + 'source_filename' => @workbench_import.file.file.file, + 'spurious_dirs' => entry.spurious.join(', ') }) end end diff --git a/spec/workers/workbench_import/workbench_import_worker_spec.rb b/spec/workers/workbench_import/workbench_import_worker_spec.rb index deaa1e3a5..47ca2b4ff 100644 --- a/spec/workers/workbench_import/workbench_import_worker_spec.rb +++ b/spec/workers/workbench_import/workbench_import_worker_spec.rb @@ -115,8 +115,8 @@ RSpec.describe WorkbenchImportWorker, type: [:worker, :request] do let( :spurious ){ [spurious1, spurious2] } let( :messages ){ double('messages') } let( :message_attributes ){{criticity: :warning, message_key: 'inconsistent_zip_file'}} - let( :message1_attributes ){ message_attributes.merge(message_attributes: {'import_name' => import.name, 'spurious_dirs' => spurious1.join(', ')}) } - let( :message2_attributes ){ message_attributes.merge(message_attributes: {'import_name' => import.name, 'spurious_dirs' => spurious2.join(', ')}) } + let( :message1_attributes ){ message_attributes.merge(message_attributes: {'source_filename' => import.file.file.file, 'spurious_dirs' => spurious1.join(', ')}) } + let( :message2_attributes ){ message_attributes.merge(message_attributes: {'source_filename' => import.file.file.file, 'spurious_dirs' => spurious2.join(', ')}) } before do allow(import).to receive(:messages).and_return(messages) -- cgit v1.2.3