Merge pull request #12694 from mareklibra/OCPBUGS-11197.rephrase.vCenter

OCPBUGS-11197: Rephrase vCenter connection tooltips

frontend/packages/vsphere-plugin/locales/en/vsphere-plugin.json

@@ -3,7 +3,7 @@
   "vSphere configurations": "vSphere configurations",
   "Loading vSphere connection status": "Loading vSphere connection status",
   "The vSphere Connection check is failing.": "The vSphere Connection check is failing.",
-  "No error is reported, open for detailed status.": "No error is reported, open for detailed status.",
+  "No errors are reported. Click the link for details.": "No errors are reported. Click the link for details.",
   "Missing the vSphere config map.": "Missing the vSphere config map.",
   "Not configured yet": "Not configured yet",
   "Prometheus query failed.": "Prometheus query failed.",
@@ -21,19 +21,19 @@
   "vsphere-connection-form-datastorehelp-one": "The name of an existing datastore in the datacenter where the persistent volumes will be stored.",
   "vsphere-connection-form-datastorehelp-two": "Note: Updating this value will break any existing PersistentVolumes.",
   "vCenter": "vCenter",
-  "Enter the network address the vCenter is running on. It can either be a domain name or IP. If you're unsure, you can try to determine the value from the vSphere Web Client address. Example: ": "Enter the network address the vCenter is running on. It can either be a domain name or IP. If you're unsure, you can try to determine the value from the vSphere Web Client address. Example: ",
-  "Can be both domain name or IP, see additional info how to get it.": "Can be both domain name or IP, see additional info how to get it.",
+  "Enter the network address of the vCenter server. It can either be a domain name or IP address. It appears in the vSphere web client URL. Example:  ": "Enter the network address of the vCenter server. It can either be a domain name or IP address. It appears in the vSphere web client URL. Example:  ",
+  "Can be either domain name or IP address. See tooltip for details.": "Can be either domain name or IP address. See tooltip for details.",
   "Username": "Username",
-  "The vSphere vCenter username. Mind to double-check it is correct, otherwise cluster nodes will get unschedulable (Known issue: OCPBUGS-2353).": "The vSphere vCenter username. Mind to double-check it is correct, otherwise cluster nodes will get unschedulable (Known issue: OCPBUGS-2353).",
+  "Enter the vSphere vCenter username. An incorrect username will render the cluster nodes unschedulable (known issue: OCPBUGS-2353).": "Enter the vSphere vCenter username. An incorrect username will render the cluster nodes unschedulable (known issue: OCPBUGS-2353).",
   "Password": "Password",
-  "The password will be stored in a Secret in the kube-system namespace of this cluster. Mind to double-check it is correct, otherwise cluster nodes will get unschedulable (Known issue: OCPBUGS-2353).": "The password will be stored in a Secret in the kube-system namespace of this cluster. Mind to double-check it is correct, otherwise cluster nodes will get unschedulable (Known issue: OCPBUGS-2353).",
+  "Enter the vSphere vCenter password. The password will be stored in a Secret in the kube-system namespace for this cluster. An incorrect password will render the cluster nodes unschedulable (known issue: OCPBUGS-2353).": "Enter the vSphere vCenter password. The password will be stored in a Secret in the kube-system namespace for this cluster. An incorrect password will render the cluster nodes unschedulable (known issue: OCPBUGS-2353).",
   "Datacenter": "Datacenter",
   "Default data store": "Default data store",
   "Virtual Machine Folder": "Virtual Machine Folder",
   "vSphere Problem Detector (can be outdated)": "vSphere Problem Detector (can be outdated)",
   "Retry": "Retry",
   "Delayed propagation of configuration": "Delayed propagation of configuration",
-  "After saving the configuration, it might take approximately 1 hour to see if the settings are correct and the operators' statuses are updated, nodes will get rebooted.": "After saving the configuration, it might take approximately 1 hour to see if the settings are correct and the operators' statuses are updated, nodes will get rebooted.",
+  "The configuration process updates operator statuses and reboots nodes. This process typically takes about an hour. Existing resources such as previously bound Persistent Volume Claims might become disconnected.": "The configuration process updates operator statuses and reboots nodes. This process typically takes about an hour. Existing resources such as previously bound Persistent Volume Claims might become disconnected.",
   "Note, that existing resources (like already bound PVCs) might get broken by these changes.": "Note, that existing resources (like already bound PVCs) might get broken by these changes.",
   "Saving": "Saving",
   "Cancel": "Cancel",

frontend/packages/vsphere-plugin/src/components/ClusterOverview/VSphereStatus.tsx

@@ -59,7 +59,7 @@ export const healthHandler: PrometheusHealthHandler = (responses, t, additionalR
       message = health.message;
       break;
     case HealthState.OK:
-      message = t('vsphere-plugin~No error is reported, open for detailed status.');
+      message = t('vsphere-plugin~No errors are reported. Click the link for details.');
       break;
     default:
       break;

frontend/packages/vsphere-plugin/src/components/VSphereConnectionForm.tsx

@@ -91,13 +91,14 @@ export const VSphereConnectionForm: React.FC<VSphereConnectionProps> = ({
   const datacenterHelperText = (
     <>
       <Trans i18nKey="vsphere-plugin~vsphere-connection-form-datacenterhelp-one">
-        The name of an existing datacenter in the vSphere which the virtual machines backing this
-        cluster are in.
+        Enter the name of the vSphere data center that contains the virtual machines currently
+        backing-up the cluster.
       </Trans>
       <br />
       <strong>
         <Trans i18nKey="vsphere-plugin~vsphere-connection-form-datacenterhelp-two">
-          Note: Updating this value will break any existing PersistentVolumes.
+          Warning: Updating this value once the configuration has been saved will detach any
+          existing PersistentVolumes.
         </Trans>
       </strong>
     </>
@@ -106,13 +107,13 @@ export const VSphereConnectionForm: React.FC<VSphereConnectionProps> = ({
   const datastoreHelperText = (
     <>
       <Trans i18nKey="vsphere-plugin~vsphere-connection-form-datastorehelp-one">
-        The name of an existing datastore in the datacenter where the persistent volumes will be
-        stored.
+        Select the data store in the vSphere data center that is to store the persistent data
+        volumes.
       </Trans>
       <br />
       <strong>
         <Trans i18nKey="vsphere-plugin~vsphere-connection-form-datastorehelp-two">
-          Note: Updating this value will break any existing PersistentVolumes.
+          Warning: Updating this value will break any existing PersistentVolumes.
         </Trans>
       </strong>
       .
@@ -128,7 +129,7 @@ export const VSphereConnectionForm: React.FC<VSphereConnectionProps> = ({
             content={
               <>
                 {t(
-                  "vsphere-plugin~Enter the network address the vCenter is running on. It can either be a domain name or IP. If you're unsure, you can try to determine the value from the vSphere Web Client address. Example: ",
+                  'vsphere-plugin~Enter the network address of the vCenter server. It can either be a domain name or IP address. It appears in the vSphere web client URL. Example:  ',
                 )}
                 <ul>
                   <li>https://[your_vCenter_address]/ui</li>
@@ -140,7 +141,7 @@ export const VSphereConnectionForm: React.FC<VSphereConnectionProps> = ({
         isRequired
         fieldId="connection-vcenter"
         helperText={t(
-          'vsphere-plugin~Can be both domain name or IP, see additional info how to get it.',
+          'vsphere-plugin~Can be either domain name or IP address. See tooltip for details.',
         )}
       >
         <TextInput
@@ -161,7 +162,7 @@ export const VSphereConnectionForm: React.FC<VSphereConnectionProps> = ({
         labelIcon={
           <PopoverHelpButton
             content={t(
-              'vsphere-plugin~The vSphere vCenter username. Mind to double-check it is correct, otherwise cluster nodes will get unschedulable (Known issue: OCPBUGS-2353).',
+              'vsphere-plugin~Enter the vSphere vCenter username. An incorrect username will render the cluster nodes unschedulable (known issue: OCPBUGS-2353).',
             )}
           />
         }
@@ -180,7 +181,7 @@ export const VSphereConnectionForm: React.FC<VSphereConnectionProps> = ({
         labelIcon={
           <PopoverHelpButton
             content={t(
-              'vsphere-plugin~The password will be stored in a Secret in the kube-system namespace of this cluster. Mind to double-check it is correct, otherwise cluster nodes will get unschedulable (Known issue: OCPBUGS-2353).',
+              'vsphere-plugin~Enter the vSphere vCenter password. The password will be stored in a Secret in the kube-system namespace for this cluster. An incorrect password will render the cluster nodes unschedulable (known issue: OCPBUGS-2353).',
             )}
           />
         }

frontend/packages/vsphere-plugin/src/components/VSphereConnectionModal.tsx

@@ -117,7 +117,7 @@ export const VSphereConnectionModal: React.FC<VSphereConnectionProps> = (props)
         title={t('vsphere-plugin~Delayed propagation of configuration')}
       >
         {t(
-          "vsphere-plugin~After saving the configuration, it might take approximately 1 hour to see if the settings are correct and the operators' statuses are updated, nodes will get rebooted.",
+          'vsphere-plugin~The configuration process updates operator statuses and reboots nodes. This process typically takes about an hour. Existing resources such as previously bound Persistent Volume Claims might become disconnected.',
         )}
         <br />
         {t(