From 3d41cc4c3d2167342dda6a705367a3fe1465ae0b Mon Sep 17 00:00:00 2001
From: Naumov Alexey <Iamemptyhuh@gmail.com>
Date: Tue, 20 Oct 2020 16:36:50 +0300
Subject: [PATCH 1/2] improve(core-connection): CB-413 deletion confirm dialog
 locales changes

CB-413
---
 .../Connections/ConnectionsAdministrationController.ts       | 5 +++--
 .../Administration/Users/UsersAdministrationController.ts    | 3 ++-
 webapp/packages/plugin-authentication/src/locales/en.ts      | 1 +
 webapp/packages/plugin-authentication/src/locales/ru.ts      | 1 +
 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/webapp/packages/core-connections/src/Administration/Connections/ConnectionsAdministrationController.ts b/webapp/packages/core-connections/src/Administration/Connections/ConnectionsAdministrationController.ts
index 73f2d4b47a..f6687122a1 100644
--- a/webapp/packages/core-connections/src/Administration/Connections/ConnectionsAdministrationController.ts
+++ b/webapp/packages/core-connections/src/Administration/Connections/ConnectionsAdministrationController.ts
@@ -84,8 +84,9 @@ export class ConnectionsAdministrationController {
       .filter(Boolean);
 
     const confirmed = await this.commonDialogService.open(ConfirmationDialog, {
-      title: 'authentication_administration_confirm_user_deletion',
-      message: `Would you like to delete connections: ${connectionNames.join(', ')}`,
+      title: 'authentication_administration_confirm_connection_deletion',
+      message: `You're going to delete these connections: ${connectionNames.join(', ')}. Are you sure?`,
+      confirmActionText: 'ui_delete',
     });
 
     if (!confirmed) {
diff --git a/webapp/packages/plugin-authentication/src/Administration/Users/UsersAdministrationController.ts b/webapp/packages/plugin-authentication/src/Administration/Users/UsersAdministrationController.ts
index 4fd11f9e33..0846eaae08 100644
--- a/webapp/packages/plugin-authentication/src/Administration/Users/UsersAdministrationController.ts
+++ b/webapp/packages/plugin-authentication/src/Administration/Users/UsersAdministrationController.ts
@@ -99,7 +99,8 @@ export class UsersAdministrationController {
 
     const confirmed = await this.commonDialogService.open(ConfirmationDialog, {
       title: 'authentication_administration_confirm_user_deletion',
-      message: `Would you like to delete users: ${deletionList.join(', ')}`,
+      message: `You're going to delete these users: ${deletionList.join(', ')}. Are you sure?`,
+      confirmActionText: 'ui_delete',
     });
 
     if (!confirmed) {
diff --git a/webapp/packages/plugin-authentication/src/locales/en.ts b/webapp/packages/plugin-authentication/src/locales/en.ts
index f69095eac0..2f49304f9f 100644
--- a/webapp/packages/plugin-authentication/src/locales/en.ts
+++ b/webapp/packages/plugin-authentication/src/locales/en.ts
@@ -14,6 +14,7 @@ export default [
   ['authentication_administration_user_info', 'Info'],
   ['authentication_administration_item', 'Users'],
   ['authentication_administration_confirm_user_deletion', 'Confirm user deletion'],
+  ['authentication_administration_confirm_connection_deletion', 'Confirm connection deletion'],
   ['authentication_administration_user_updated', 'User updated'],
   ['authentication_administration_user_created', 'User was created successfully'],
   ['authentication_user_name', 'User name'],
diff --git a/webapp/packages/plugin-authentication/src/locales/ru.ts b/webapp/packages/plugin-authentication/src/locales/ru.ts
index 5a59ecddc9..611a5c701b 100644
--- a/webapp/packages/plugin-authentication/src/locales/ru.ts
+++ b/webapp/packages/plugin-authentication/src/locales/ru.ts
@@ -14,6 +14,7 @@ export default [
   ['authentication_administration_user_info', 'Общее'],
   ['authentication_administration_item', 'Пользователи'],
   ['authentication_administration_confirm_user_deletion', 'Подтвердите удаление'],
+  ['authentication_administration_confirm_connection_deletion', 'Подтвердите удаление'],
   ['authentication_administration_user_updated', 'User updated'],
   ['authentication_administration_user_created', 'Пользователь создан успешно'],
   ['authentication_user_name', 'Имя'],

From 56d4af5ca2d322e4bcf401d86f79ab5b33af54dd Mon Sep 17 00:00:00 2001
From: Naumov Alexey <Iamemptyhuh@gmail.com>
Date: Tue, 20 Oct 2020 16:39:37 +0300
Subject: [PATCH 2/2] improve(core-connection): CB-413 deletion confirm dialog
 locale changes

---
 .../packages/core-connections/src/ConnectionsManagerService.ts  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webapp/packages/core-connections/src/ConnectionsManagerService.ts b/webapp/packages/core-connections/src/ConnectionsManagerService.ts
index b28fcba503..10ff8f0638 100644
--- a/webapp/packages/core-connections/src/ConnectionsManagerService.ts
+++ b/webapp/packages/core-connections/src/ConnectionsManagerService.ts
@@ -83,7 +83,7 @@ export class ConnectionsManagerService {
 
     const confirmed = await this.commonDialogService.open(ConfirmationDialog, {
       title: 'app_shared_navigationTree_delete_connection_confirm',
-      message: `Would you like to delete ${connection.name} connection?`,
+      message: `You're going to delete ${connection.name} connection. Are you sure?`,
       confirmActionText: 'ui_delete',
     });
     if (!confirmed) {