From 5c1a047aca5517eb43a4b920f41d0edf6d215e8c Mon Sep 17 00:00:00 2001 From: Jason Frey Date: Mon, 30 Sep 2024 17:23:53 -0400 Subject: [PATCH] Remove newlines from result 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 --- app/controllers/miq_ae_tools_controller.rb | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/app/controllers/miq_ae_tools_controller.rb b/app/controllers/miq_ae_tools_controller.rb index c3d1f57b306..453a77ce504 100644 --- a/app/controllers/miq_ae_tools_controller.rb +++ b/app/controllers/miq_ae_tools_controller.rb @@ -286,11 +286,7 @@ def upload if params[:upload] && params[:upload][:datastore].present? begin MiqAeDatastore.upload(params[:upload][:datastore]) - flash_to_session(_("Datastore import was successful. -Namespaces updated/added: %{namespace_stats} -Classes updated/added: %{class_stats} -Instances updated/added: %{instance_stats} -Methods updated/added: %{method_stats}") % stat_options) + flash_to_session(_("Datastore import was successful. Added/Updated %{namespace_stats} Namespaces, %{class_stats} Classes, %{instance_stats} Instances, %{method_stats} Methods.") % stat_options) redirect_to(:action => 'import_export') rescue StandardError => bang flash_to_session(_("Error during 'upload': %{message}") % {:message => bang.message}, :error)