From 176ee2c5cc4a7c1a10c33bc2f17c28d5a461c91b Mon Sep 17 00:00:00 2001
From: Denys Vuika <denys.vuika@gmail.com>
Date: Wed, 11 Apr 2018 07:22:01 +0100
Subject: [PATCH] [ACA-1270] delete confirmation dialog strings (#294)

* delete confirmation dialog strings

* upgrade to latest adf with dialog fixes
---
 package-lock.json                             | 32 ++++---------------
 package.json                                  |  4 +--
 .../node-permanent-delete.directive.ts        |  4 ++-
 src/assets/i18n/en.json                       |  6 ++--
 4 files changed, 16 insertions(+), 30 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 74fe43e03..088950fc5 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -5,11 +5,11 @@
   "requires": true,
   "dependencies": {
     "@alfresco/adf-content-services": {
-      "version": "2.3.0-11d38efe2bf383d919bef5fdfd5ac39fcf0cfdcd",
-      "resolved": "https://registry.npmjs.org/@alfresco/adf-content-services/-/adf-content-services-2.3.0-11d38efe2bf383d919bef5fdfd5ac39fcf0cfdcd.tgz",
-      "integrity": "sha512-xEr8zGfAzLzmXbz7AZuQ24+Rlw83Crj0Mnjg21z/GPRO4mGcZe/KBDilughwRzwIzowkrh6pwfvKhSunFIOx8Q==",
+      "version": "2.3.0-12df7500dad61b46e08eec1f0427ece083481dbb",
+      "resolved": "https://registry.npmjs.org/@alfresco/adf-content-services/-/adf-content-services-2.3.0-12df7500dad61b46e08eec1f0427ece083481dbb.tgz",
+      "integrity": "sha512-yHswrfIDUv/xtdIcgzT9Bfn+0I0KLdjXiGZuqVDBbwQmcnHgRcRdbWfGjeRMsS2ZaJGO/COMsnEvoHDrML4xdA==",
       "requires": {
-        "@alfresco/adf-core": "2.3.0-11d38efe2bf383d919bef5fdfd5ac39fcf0cfdcd",
+        "@alfresco/adf-core": "2.3.0-12df7500dad61b46e08eec1f0427ece083481dbb",
         "@angular/animations": "5.1.1",
         "@angular/cdk": "5.0.1",
         "@angular/common": "5.1.1",
@@ -40,15 +40,6 @@
         "zone.js": "0.8.14"
       },
       "dependencies": {
-        "alfresco-js-api": {
-          "version": "2.3.0-3f1a4cec6a79f4bb71ae7c0ef962539739662f09",
-          "resolved": "https://registry.npmjs.org/alfresco-js-api/-/alfresco-js-api-2.3.0-3f1a4cec6a79f4bb71ae7c0ef962539739662f09.tgz",
-          "integrity": "sha512-ytZ919Qk6m/vDNwS47omuP026rYFfKEjcDSr2QDwSMHLrOs412ctSiRgo4On9B8JD5ErpGJHZotQzOt0a9fLYA==",
-          "requires": {
-            "event-emitter": "0.3.4",
-            "superagent": "3.8.2"
-          }
-        },
         "core-js": {
           "version": "2.4.1",
           "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.4.1.tgz",
@@ -70,9 +61,9 @@
       }
     },
     "@alfresco/adf-core": {
-      "version": "2.3.0-11d38efe2bf383d919bef5fdfd5ac39fcf0cfdcd",
-      "resolved": "https://registry.npmjs.org/@alfresco/adf-core/-/adf-core-2.3.0-11d38efe2bf383d919bef5fdfd5ac39fcf0cfdcd.tgz",
-      "integrity": "sha512-+oQKuuMx3D2EtYAqD/tfn2NWJ5r6Ioi+mLwC5vRQuu1tWnIToHVmyhu4ooa/3O05N5cHGoMr1zfJpOcu8NjvZQ==",
+      "version": "2.3.0-12df7500dad61b46e08eec1f0427ece083481dbb",
+      "resolved": "https://registry.npmjs.org/@alfresco/adf-core/-/adf-core-2.3.0-12df7500dad61b46e08eec1f0427ece083481dbb.tgz",
+      "integrity": "sha512-A8tNc9Ic3/Z/Ds7p/3UArahFoMdX/UCkyE7yo4HidR0gLE4Zwx498IoJsON3goABnvpsVaSQgWt/N/SdraTb1A==",
       "requires": {
         "@angular/animations": "5.1.1",
         "@angular/cdk": "5.0.1",
@@ -104,15 +95,6 @@
         "zone.js": "0.8.14"
       },
       "dependencies": {
-        "alfresco-js-api": {
-          "version": "2.3.0-3f1a4cec6a79f4bb71ae7c0ef962539739662f09",
-          "resolved": "https://registry.npmjs.org/alfresco-js-api/-/alfresco-js-api-2.3.0-3f1a4cec6a79f4bb71ae7c0ef962539739662f09.tgz",
-          "integrity": "sha512-ytZ919Qk6m/vDNwS47omuP026rYFfKEjcDSr2QDwSMHLrOs412ctSiRgo4On9B8JD5ErpGJHZotQzOt0a9fLYA==",
-          "requires": {
-            "event-emitter": "0.3.4",
-            "superagent": "3.8.2"
-          }
-        },
         "core-js": {
           "version": "2.4.1",
           "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.4.1.tgz",
diff --git a/package.json b/package.json
index cdbeee703..fa0724bc7 100644
--- a/package.json
+++ b/package.json
@@ -18,8 +18,8 @@
   },
   "private": true,
   "dependencies": {
-    "@alfresco/adf-content-services": "2.3.0-11d38efe2bf383d919bef5fdfd5ac39fcf0cfdcd",
-    "@alfresco/adf-core": "2.3.0-11d38efe2bf383d919bef5fdfd5ac39fcf0cfdcd",
+    "@alfresco/adf-content-services": "2.3.0-12df7500dad61b46e08eec1f0427ece083481dbb",
+    "@alfresco/adf-core": "2.3.0-12df7500dad61b46e08eec1f0427ece083481dbb",
     "@angular/animations": "5.1.1",
     "@angular/cdk": "5.0.1",
     "@angular/common": "5.1.1",
diff --git a/src/app/common/directives/node-permanent-delete.directive.ts b/src/app/common/directives/node-permanent-delete.directive.ts
index 9a395b84d..a9aa7f90a 100644
--- a/src/app/common/directives/node-permanent-delete.directive.ts
+++ b/src/app/common/directives/node-permanent-delete.directive.ts
@@ -46,7 +46,9 @@ export class NodePermanentDeleteDirective {
         const dialogRef = this.dialog.open(ConfirmDialogComponent, {
             data: {
                 title: 'APP.DIALOGS.CONFIRM_PURGE.TITLE',
-                message: 'APP.DIALOGS.CONFIRM_PURGE.MESSAGE'
+                message: 'APP.DIALOGS.CONFIRM_PURGE.MESSAGE',
+                yesLabel: 'APP.DIALOGS.CONFIRM_PURGE.YES_LABEL',
+                noLabel: 'APP.DIALOGS.CONFIRM_PURGE.NO_LABEL'
             },
             minWidth: '250px'
         });
diff --git a/src/assets/i18n/en.json b/src/assets/i18n/en.json
index c4576be3e..d3f9b478e 100644
--- a/src/assets/i18n/en.json
+++ b/src/assets/i18n/en.json
@@ -108,8 +108,10 @@
         },
         "DIALOGS": {
             "CONFIRM_PURGE": {
-                "TITLE": "Delete",
-                "MESSAGE": "Permanently delete item(s) from the trash?"
+                "TITLE": "Delete from trash?",
+                "MESSAGE": "This will permanently remove the selected item(s).",
+                "YES_LABEL": "Delete",
+                "NO_LABEL": "Keep"
             }
         },
         "DOCUMENT_LIST": {