From c64d35422ba8774b1a2abb7649c3d775c300ad43 Mon Sep 17 00:00:00 2001 From: Jason Frey Date: Mon, 30 Sep 2024 15:17:22 -0400 Subject: [PATCH] Remove newlines from help 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 --- .../manageiq/providers/kubernetes/container_manager.rb | 4 +--- .../providers/kubernetes/container_manager/options.rb | 5 ++--- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/app/models/manageiq/providers/kubernetes/container_manager.rb b/app/models/manageiq/providers/kubernetes/container_manager.rb index 5e322922a2..e7b5fab311 100644 --- a/app/models/manageiq/providers/kubernetes/container_manager.rb +++ b/app/models/manageiq/providers/kubernetes/container_manager.rb @@ -520,9 +520,7 @@ def self.params_for_create :id => 'options.image_inspector_options.cve_url', :name => 'options.image_inspector_options.cve_url', :label => _('CVE Location'), - :helperText => _('Enables defining a URL path prefix for XCCDF file instead of accessing the default location. -example: http://my_file_server.org:3333/xccdf_files/ -Expecting to find com.redhat.rhsa-RHEL7.ds.xml.bz2 file there.'), + :helperText => _('Alternative URL path for the XCCDF file, where a com.redhat.rhsa-RHEL7.ds.xml.bz2 file is expected. example: http://my_file_server.example.org:3333/xccdf_files/'), :placeholder => ::Settings.ems.ems_kubernetes.image_inspector_cve_url }, ], diff --git a/app/models/manageiq/providers/kubernetes/container_manager/options.rb b/app/models/manageiq/providers/kubernetes/container_manager/options.rb index a82a582bae..70c569a416 100644 --- a/app/models/manageiq/providers/kubernetes/container_manager/options.rb +++ b/app/models/manageiq/providers/kubernetes/container_manager/options.rb @@ -47,9 +47,8 @@ def advanced_settings }, :cve_url => { :label => N_('CVE Location'), - :help_text => N_('Enables defining a URL path prefix for XCCDF file instead of accessing the default location. - example: http://my_file_server.org:3333/xccdf_files/ - Expecting to find com.redhat.rhsa-RHEL7.ds.xml.bz2 file there.'), + :help_text => N_('Alternative URL path for the XCCDF file, where a com.redhat.rhsa-RHEL7.ds.xml.bz2 file is expected. example: http://my_file_server.example.org:3333/xccdf_files/'), + # Future versions of image inspector will extend this. :global_default => ::Settings.ems.ems_kubernetes.image_inspector_cve_url, },