diff --git a/console/src/app/modules/warn-dialog/warn-dialog.component.html b/console/src/app/modules/warn-dialog/warn-dialog.component.html index b70d8620b2..17c21f28b6 100644 --- a/console/src/app/modules/warn-dialog/warn-dialog.component.html +++ b/console/src/app/modules/warn-dialog/warn-dialog.component.html @@ -8,6 +8,9 @@ {{ data.warnSectionKey | translate }} + +

{{ data.hintKey | translate: { value: data.confirmation } }}

+ {{ data.confirmationKey | translate: { value: data.confirmation } }} diff --git a/console/src/app/pages/users/user-list/user-table/user-table.component.ts b/console/src/app/pages/users/user-list/user-table/user-table.component.ts index 94c2aa3260..008cbe126d 100644 --- a/console/src/app/pages/users/user-list/user-table/user-table.component.ts +++ b/console/src/app/pages/users/user-list/user-table/user-table.component.ts @@ -256,8 +256,10 @@ export class UserTableComponent implements OnInit { confirmKey: 'ACTIONS.DELETE', cancelKey: 'ACTIONS.CANCEL', titleKey: 'USER.DIALOG.DELETE_SELF_TITLE', - descriptionKey: 'USER.DIALOG.DELETE_SELF_DESCRIPTION', - confirmationKey: 'USER.DIALOG.TYPEUSERNAME', + warnSectionKey: 'USER.DIALOG.DELETE_SELF_DESCRIPTION', + hintKey: 'USER.DIALOG.TYPEUSERNAME', + hintParam: 'USER.DIALOG.DELETE_DESCRIPTION', + confirmationKey: 'USER.DIALOG.USERNAME', confirmation: user.preferredLoginName, }; @@ -265,8 +267,10 @@ export class UserTableComponent implements OnInit { confirmKey: 'ACTIONS.DELETE', cancelKey: 'ACTIONS.CANCEL', titleKey: 'USER.DIALOG.DELETE_TITLE', - descriptionKey: 'USER.DIALOG.DELETE_DESCRIPTION', - confirmationKey: 'USER.DIALOG.TYPEUSERNAME', + warnSectionKey: 'USER.DIALOG.DELETE_DESCRIPTION', + hintKey: 'USER.DIALOG.TYPEUSERNAME', + hintParam: 'USER.DIALOG.DELETE_DESCRIPTION', + confirmationKey: 'USER.DIALOG.USERNAME', confirmation: user.preferredLoginName, }; diff --git a/console/src/assets/i18n/de.json b/console/src/assets/i18n/de.json index ac5f3050af..29e5fe2b1b 100644 --- a/console/src/assets/i18n/de.json +++ b/console/src/assets/i18n/de.json @@ -256,6 +256,7 @@ "DELETE_SELF_DESCRIPTION": "Sie sind im Begriff Ihren eigenen Benutzer endgültig zu löschen. Dadurch werden Sie ausgeloggt und Ihr Account wird gelöscht. Diese Aktion kann nicht rückgängig gemacht werden!", "DELETE_AUTH_DESCRIPTION": "Sie sind im Begriff Ihren Account endgültig zu löschen. Wollen Sie dies wirklich tun?", "TYPEUSERNAME": "Wiederholen Sie '{{value}}', um den Benutzer zu löschen.", + "USERNAME": "Loginname", "DELETE_BTN": "Endgültig löschen" }, "SENDEMAILDIALOG": { diff --git a/console/src/assets/i18n/en.json b/console/src/assets/i18n/en.json index 5e09dde0e9..100204ed94 100644 --- a/console/src/assets/i18n/en.json +++ b/console/src/assets/i18n/en.json @@ -256,6 +256,7 @@ "DELETE_SELF_DESCRIPTION": "You are about to permanently delete your personal account. This will log you out and delete your user. This action cannot be undone!", "DELETE_AUTH_DESCRIPTION": "You are about to permanently delete your personal account. Are you sure?", "TYPEUSERNAME": "Type '{{value}}', to confirm and delete the user.", + "USERNAME": "Loginname", "DELETE_BTN": "Delete permanently" }, "SENDEMAILDIALOG": { diff --git a/console/src/assets/i18n/fr.json b/console/src/assets/i18n/fr.json index 2206c5344b..f3cd110a8d 100644 --- a/console/src/assets/i18n/fr.json +++ b/console/src/assets/i18n/fr.json @@ -256,6 +256,7 @@ "DELETE_SELF_DESCRIPTION": "Vous êtes sur le point de supprimer définitivement votre compte personnel. Cela vous déconnectera et supprimera votre utilisateur. Cette action ne peut être annulée !", "DELETE_AUTH_DESCRIPTION": "Vous êtes sur le point de supprimer définitivement votre compte personnel. En êtes-vous sûr ?", "TYPEUSERNAME": "Tapez '{{value}}', pour confirmer et supprimer l'utilisateur.", + "USERNAME": "Identifiant", "DELETE_BTN": "Supprimer définitivement" }, "SENDEMAILDIALOG": { diff --git a/console/src/assets/i18n/it.json b/console/src/assets/i18n/it.json index 466bc14c5b..adf81d2732 100644 --- a/console/src/assets/i18n/it.json +++ b/console/src/assets/i18n/it.json @@ -256,6 +256,7 @@ "DELETE_SELF_DESCRIPTION": "Stai per eliminare definitivamente il tuo account. Questo ti disconnetterà ed eliminerà il tuo utente. Questa azione non può essere annullata!", "DELETE_AUTH_DESCRIPTION": "Stai per eleminare il tuo account personale in modo permanente. Vuoi continuare?", "TYPEUSERNAME": "Ripeti '{{value}}' per confermare ed eliminare l'utente.", + "USERNAME": "Nome utente", "DELETE_BTN": "Elimina" }, "SENDEMAILDIALOG": { diff --git a/console/src/assets/i18n/zh.json b/console/src/assets/i18n/zh.json index 0aaab391a8..33dae1a708 100644 --- a/console/src/assets/i18n/zh.json +++ b/console/src/assets/i18n/zh.json @@ -256,6 +256,7 @@ "DELETE_SELF_DESCRIPTION": "您即将永久删除您的个人帐户。这将使您注销并删除您的用户。此操作无法撤消!", "DELETE_AUTH_DESCRIPTION": "您即将永久删除您的个人帐户。你确定吗?", "TYPEUSERNAME": "输入 '{{value}}',确认并删除该用户。", + "USERNAME": "登录名", "DELETE_BTN": "永久删除" }, "SENDEMAILDIALOG": {