From 4359e0c3acd9a346f001496fe90890ba37411440 Mon Sep 17 00:00:00 2001 From: Jason Frey Date: Mon, 30 Sep 2024 15:01:26 -0400 Subject: [PATCH] Remove newlines from error message Newlines can cause trouble with translations as well as presentation in the UI. This particular string doesn't actually need the newlines, so this commit changes it to just not have them. Alternative to ManageIQ/manageiq#23213 --- .../infra_manager/vm_or_template_shared/scanning.rb | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/app/models/manageiq/providers/ovirt/infra_manager/vm_or_template_shared/scanning.rb b/app/models/manageiq/providers/ovirt/infra_manager/vm_or_template_shared/scanning.rb index cee5d703..cbb56c57 100644 --- a/app/models/manageiq/providers/ovirt/infra_manager/vm_or_template_shared/scanning.rb +++ b/app/models/manageiq/providers/ovirt/infra_manager/vm_or_template_shared/scanning.rb @@ -51,11 +51,12 @@ def perform_metadata_sync(ost) sync_stashed_metadata(ost) end - RHEVM_NO_PROXIES_ERROR_MSG = N_('VMs must be scanned from an EVM server whose host is attached to the same - storage as the VM unless overridden via SmartProxy affinity. - Please verify that: - 1) Direct LUNs are attached to ManageIQ appliance - 2) Management Relationship is set for the ManageIQ appliance') + RHEVM_NO_PROXIES_ERROR_MSG = N_( + "VMs must be scanned from an appliances whose host is attached to the same " \ + "storage as the VM unless overridden via SmartProxy affinity. Please verify " \ + "that direct LUNs are attached to the appliance and that the management " \ + "relationship is set for the appliance." + ) def proxies4job(_job = nil) _log.debug "Enter (RHEVM)"