Merge remote-tracking branch 'origin/devel' into devel

This commit is contained in:
Serge Rider
2020-10-20 18:44:01 +03:00
5 changed files with 8 additions and 4 deletions
@@ -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) {
@@ -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) {
@@ -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) {
@@ -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'],
@@ -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', 'Имя'],