Merge branch 'main' into w14-dependency-updates

SFDO-Tooling · May 30, 2024 · d366485 · d366485
2 parents 5081a52 + 77959df
commit d366485
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/locales/en/translation.json b/locales/en/translation.json
@@ -73,12 +73,12 @@
   "Oh no! This installation encountered an error.": "Oh no! This installation encountered an error.",
   "One Time Apex": "One Time Apex",
   "Only I and Salesforce staff can view this installation job.": "Only I and Salesforce staff can view this installation job.",
-  "Oops! It looks like you don’t have permissions to run an installation on this org.": "Oops! It looks like you don’t have permissions to run an installation on this org.",
+  "Oops! It looks like you have been logged out or don’t have permissions to run an installation on this org.": "Oops! It looks like you have been logged out or don’t have permissions to run an installation on this org.",
   "Optional": "Optional",
   "Org:": "Org:",
   "Other": "Other",
   "Package": "Package",
-  "Please contact an Admin within your org or use the button below to log in with a different org.": "Please contact an Admin within your org or use the button below to log in with a different org.",
+  "Please log back in, contact an Admin, or use the button below to log in with a different org.": "Please log back in, contact an Admin, or use the button below to log in with a different org.",
   "Potential Issues": "Potential Issues",
   "Pre-Install Validation In Progress…": "Pre-Install Validation In Progress…",
   "Pre-install validation completed successfully.": "Pre-install validation completed successfully.",

diff --git a/locales_dev/en/translation.json b/locales_dev/en/translation.json
@@ -67,10 +67,10 @@
   "Not Connected to Salesforce": "Not Connected to Salesforce",
   "Oh no! This installation encountered an error.": "Oh no! This installation encountered an error.",
   "Only I and Salesforce staff can view this installation job.": "Only I and Salesforce staff can view this installation job.",
-  "Oops! It looks like you don’t have permissions to run an installation on this org.": "Oops! It looks like you don’t have permissions to run an installation on this org.",
+  "Oops! It looks like you have been logged out or don’t have permissions to run an installation on this org.": "Oops! It looks like you have been logged out or don’t have permissions to run an installation on this org.",
   "Optional": "Optional",
   "Org:": "Org:",
-  "Please contact an Admin within your org or use the button below to log in with a different org.": "Please contact an Admin within your org or use the button below to log in with a different org.",
+  "Please log back in, contact an Admin, or use the button below to log in with a different org.": "Please log back in, contact an Admin, or use the button below to log in with a different org.",
   "Potential Issues": "Potential Issues",
   "Pre-Install Validation In Progress…": "Pre-Install Validation In Progress…",
   "Pre-install validation completed successfully.": "Pre-install validation completed successfully.",

diff --git a/src/js/components/plans/detail.tsx b/src/js/components/plans/detail.tsx
@@ -298,13 +298,13 @@ class PlanDetail extends Component<Props, State> {
             <ErrorIcon />
             <span className="slds-text-color_error" role="alert">
               {t(
-                'Oops! It looks like you don’t have permissions to run an installation on this org.',
+                'Oops! It looks like you have been logged out or don’t have permissions to run an installation on this org.',
               )}
             </span>
           </div>
           <p>
             {t(
-              'Please contact an Admin within your org or use the button below to log in with a different org.',
+              'Please log back in, contact an Admin, or use the button below to log in with a different org.',
             )}
           </p>
         </>

diff --git a/test/js/components/plans/detail.test.js b/test/js/components/plans/detail.test.js
@@ -215,7 +215,7 @@ describe('<PlanDetail />', () => {
       });
 
       expect(
-        getByText('you don’t have permissions', { exact: false }),
+        getByText('don’t have permissions', { exact: false }),
       ).toBeVisible();
     });
   });
-Original file line number
+Diff line change
@@ Expand Up / @@ -215,7 +215,7 @@ describe('<PlanDetail />', () => { @@
           });
           expect(
-            getByText('you don’t have permissions', { exact: false }),
+            getByText('don’t have permissions', { exact: false }),
           ).toBeVisible();
         });
       });
@@ Expand Down @@