From 5358c0346e99dd56a26e1de89f95b145fac37bfe Mon Sep 17 00:00:00 2001
From: Mads Rasmussen <madsr@hey.com>
Date: Tue, 4 Mar 2025 13:21:51 +0100
Subject: [PATCH] remove the word folder in label (#18485)

---
 src/Umbraco.Web.UI.Client/src/assets/lang/en-us.ts       | 4 ++--
 src/Umbraco.Web.UI.Client/src/assets/lang/en.ts          | 4 ++--
 .../entity-action/delete-folder/delete-folder.action.ts  | 2 +-
 tests/Umbraco.Tests.AcceptanceTest/package-lock.json     | 9 +++++----
 tests/Umbraco.Tests.AcceptanceTest/package.json          | 2 +-
 .../tests/DefaultConfig/DataType/DataTypeFolder.spec.ts  | 4 ++--
 .../Settings/DocumentType/DocumentTypeFolder.spec.ts     | 2 +-
 .../Settings/MediaType/MediaTypeFolder.spec.ts           | 2 +-
 8 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/assets/lang/en-us.ts b/src/Umbraco.Web.UI.Client/src/assets/lang/en-us.ts
index cb7ab76554..9a188a97bb 100644
--- a/src/Umbraco.Web.UI.Client/src/assets/lang/en-us.ts
+++ b/src/Umbraco.Web.UI.Client/src/assets/lang/en-us.ts
@@ -35,8 +35,8 @@ export default {
 		export: 'Export',
 		exportDocumentType: 'Export Document Type',
 		folderCreate: 'Create folder',
-		folderDelete: 'Delete folder',
-		folderRename: 'Rename folder',
+		folderDelete: 'Delete',
+		folderRename: 'Rename',
 		import: 'Import',
 		importdocumenttype: 'Import Document Type',
 		importPackage: 'Import Package',
diff --git a/src/Umbraco.Web.UI.Client/src/assets/lang/en.ts b/src/Umbraco.Web.UI.Client/src/assets/lang/en.ts
index 02354a5a98..c5079d0d76 100644
--- a/src/Umbraco.Web.UI.Client/src/assets/lang/en.ts
+++ b/src/Umbraco.Web.UI.Client/src/assets/lang/en.ts
@@ -35,8 +35,8 @@ export default {
 		export: 'Export',
 		exportDocumentType: 'Export Document Type',
 		folderCreate: 'Create folder',
-		folderDelete: 'Delete folder',
-		folderRename: 'Rename folder',
+		folderDelete: 'Delete',
+		folderRename: 'Rename',
 		import: 'Import',
 		importdocumenttype: 'Import Document Type',
 		importPackage: 'Import Package',
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/tree/folder/entity-action/delete-folder/delete-folder.action.ts b/src/Umbraco.Web.UI.Client/src/packages/core/tree/folder/entity-action/delete-folder/delete-folder.action.ts
index f076800505..4947ccee23 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/tree/folder/entity-action/delete-folder/delete-folder.action.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/tree/folder/entity-action/delete-folder/delete-folder.action.ts
@@ -40,7 +40,7 @@ export class UmbDeleteFolderEntityAction extends UmbEntityActionBase<MetaEntityA
 		if (folder) {
 			// TODO: maybe we can show something about how many items are part of the folder?
 			await umbConfirmModal(this._host, {
-				headline: `Delete folder ${folder.name}`,
+				headline: `Delete ${folder.name}`,
 				content: 'Are you sure you want to delete this folder?',
 				color: 'danger',
 				confirmLabel: 'Delete',
diff --git a/tests/Umbraco.Tests.AcceptanceTest/package-lock.json b/tests/Umbraco.Tests.AcceptanceTest/package-lock.json
index 1aa4f1a5b8..43ad766350 100644
--- a/tests/Umbraco.Tests.AcceptanceTest/package-lock.json
+++ b/tests/Umbraco.Tests.AcceptanceTest/package-lock.json
@@ -8,7 +8,7 @@
       "hasInstallScript": true,
       "dependencies": {
         "@umbraco/json-models-builders": "^2.0.29",
-        "@umbraco/playwright-testhelpers": "^15.0.25",
+        "@umbraco/playwright-testhelpers": "^15.0.27",
         "camelize": "^1.0.0",
         "dotenv": "^16.3.1",
         "node-fetch": "^2.6.7"
@@ -67,9 +67,10 @@
       }
     },
     "node_modules/@umbraco/playwright-testhelpers": {
-      "version": "15.0.25",
-      "resolved": "https://registry.npmjs.org/@umbraco/playwright-testhelpers/-/playwright-testhelpers-15.0.25.tgz",
-      "integrity": "sha512-La+n664iAWwqYq7hVU6sEu10WWqQA720CCZzPhMcBkCeac674YD6kQrj+4yPpGHChqD1q5zrrkQX3Xhg1pu5yQ==",
+      "version": "15.0.27",
+      "resolved": "https://registry.npmjs.org/@umbraco/playwright-testhelpers/-/playwright-testhelpers-15.0.27.tgz",
+      "integrity": "sha512-PH1KDAN3Eo0eqKh5mmcZdNWPPuEWUr8RY/ZcGApZyTt5Sys2ES8aGFEReJV1fRyHsTT7Y2Q1qQfCES8p43v0dQ==",
+      "license": "MIT",
       "dependencies": {
         "@umbraco/json-models-builders": "2.0.30",
         "node-fetch": "^2.6.7"
diff --git a/tests/Umbraco.Tests.AcceptanceTest/package.json b/tests/Umbraco.Tests.AcceptanceTest/package.json
index 1f92c74e58..3d39c24048 100644
--- a/tests/Umbraco.Tests.AcceptanceTest/package.json
+++ b/tests/Umbraco.Tests.AcceptanceTest/package.json
@@ -21,7 +21,7 @@
   },
   "dependencies": {
     "@umbraco/json-models-builders": "^2.0.29",
-    "@umbraco/playwright-testhelpers": "^15.0.25",
+    "@umbraco/playwright-testhelpers": "^15.0.27",
     "camelize": "^1.0.0",
     "dotenv": "^16.3.1",
     "node-fetch": "^2.6.7"
diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/DataType/DataTypeFolder.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/DataType/DataTypeFolder.spec.ts
index 1454cb6f34..ba07bf8123 100644
--- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/DataType/DataTypeFolder.spec.ts
+++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/DataType/DataTypeFolder.spec.ts
@@ -37,9 +37,9 @@ test('can rename a data type folder', async ({umbracoApi, umbracoUi}) => {
   // Act
   await umbracoUi.dataType.clickRootFolderCaretButton();
   await umbracoUi.dataType.clickActionsMenuForDataType(wrongDataTypeFolderName);
-  await umbracoUi.dataType.clickRenameFolderThreeDotsButton();
+  await umbracoUi.dataType.clickRenameFolderButton();
   await umbracoUi.dataType.enterFolderName(dataTypeFolderName);
-  await umbracoUi.dataType.clickConfirmRenameFolderButton();
+  await umbracoUi.dataType.clickConfirmRenameButton();
 
   // Assert
   await umbracoUi.dataType.doesSuccessNotificationHaveText(NotificationConstantHelper.success.saved);
diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/DocumentType/DocumentTypeFolder.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/DocumentType/DocumentTypeFolder.spec.ts
index dacd51f82a..2ea441b0fd 100644
--- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/DocumentType/DocumentTypeFolder.spec.ts
+++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/DocumentType/DocumentTypeFolder.spec.ts
@@ -58,7 +58,7 @@ test('can rename a document type folder', async ({umbracoApi, umbracoUi}) => {
   await umbracoUi.documentType.clickActionsMenuForName(oldFolderName);
   await umbracoUi.documentType.clickRenameFolderButton();
   await umbracoUi.documentType.enterFolderName(documentFolderName);
-  await umbracoUi.documentType.clickConfirmRenameFolderButton();
+  await umbracoUi.documentType.clickConfirmRenameButton();
 
   // Assert
   await umbracoUi.documentType.doesSuccessNotificationHaveText(NotificationConstantHelper.success.saved);
diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/MediaType/MediaTypeFolder.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/MediaType/MediaTypeFolder.spec.ts
index b78d27f596..f318fd732f 100644
--- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/MediaType/MediaTypeFolder.spec.ts
+++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/MediaType/MediaTypeFolder.spec.ts
@@ -55,7 +55,7 @@ test('can rename a media type folder', async ({umbracoApi, umbracoUi}) => {
   await umbracoUi.mediaType.clickActionsMenuForName(oldFolderName);
   await umbracoUi.mediaType.clickRenameFolderButton();
   await umbracoUi.mediaType.enterFolderName(mediaTypeFolderName);
-  await umbracoUi.mediaType.clickConfirmRenameFolderButton();
+  await umbracoUi.mediaType.clickConfirmRenameButton();
 
   // Assert
   await umbracoUi.mediaType.doesSuccessNotificationHaveText(NotificationConstantHelper.success.saved);