From 25d65aed7b8e94c9dd048adb841f3599976f69cc Mon Sep 17 00:00:00 2001 From: Noah Talerman <47070608+noahtalerman@users.noreply.github.com> Date: Tue, 9 Dec 2025 13:18:20 -0800 Subject: [PATCH] Platform agnostic error message (#37005) Current error message has macOS specific language. We use this error message for all platforms. --- .../DeleteSoftwareModal/DeleteSoftwareModal.tsx | 2 +- server/datastore/mysql/software_installers.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/pages/SoftwarePage/SoftwareTitleDetailsPage/DeleteSoftwareModal/DeleteSoftwareModal.tsx b/frontend/pages/SoftwarePage/SoftwareTitleDetailsPage/DeleteSoftwareModal/DeleteSoftwareModal.tsx index 883ec4e7f6..9bc1ef8e0a 100644 --- a/frontend/pages/SoftwarePage/SoftwareTitleDetailsPage/DeleteSoftwareModal/DeleteSoftwareModal.tsx +++ b/frontend/pages/SoftwarePage/SoftwareTitleDetailsPage/DeleteSoftwareModal/DeleteSoftwareModal.tsx @@ -14,7 +14,7 @@ const baseClass = "delete-software-modal"; const DELETE_SW_USED_BY_POLICY_ERROR_MSG = "Couldn't delete. Policy automation uses this software. Please disable policy automation for this software and try again."; const DELETE_SW_INSTALLED_DURING_SETUP_ERROR_MSG = - "Couldn't delete. This software is installed when new Macs boot. Please remove software in Controls > Setup experience and try again."; + "Couldn't delete. This software is installed during new host setup. Please remove software in Controls > Setup experience and try again."; interface IDeleteSoftwareModalProps { softwareId: number; diff --git a/server/datastore/mysql/software_installers.go b/server/datastore/mysql/software_installers.go index fc4943f59b..9c01b3eb4e 100644 --- a/server/datastore/mysql/software_installers.go +++ b/server/datastore/mysql/software_installers.go @@ -1018,7 +1018,7 @@ WHERE var ( errDeleteInstallerWithAssociatedPolicy = &fleet.ConflictError{Message: "Couldn't delete. Policy automation uses this software. Please disable policy automation for this software and try again."} - errDeleteInstallerInstalledDuringSetup = &fleet.ConflictError{Message: "Couldn't delete. This software is installed when new Macs boot. Please remove software in Controls > Setup experience and try again."} + errDeleteInstallerInstalledDuringSetup = &fleet.ConflictError{Message: "Couldn't delete. This software is installed during new host setup. Please remove software in Controls > Setup experience and try again."} ) func (ds *Datastore) DeleteSoftwareInstaller(ctx context.Context, id uint) error {