From 1484bc9f697e1e45c39c3c56b20bf148b15a2cc1 Mon Sep 17 00:00:00 2001
From: Christian Zosel <christian@zosel.ch>
Date: Wed, 23 Feb 2022 16:13:02 +0100
Subject: [PATCH] fix(translations): consistent warning msg for user deletion

Because of the generic way `EditForm` is implemented, we currently show
a generic warning message when a user is deleted from the detail view.
This uses the same warning when a user is deleted from the list view
(for consistency).
---
 addon/controllers/users/index.js | 2 +-
 addon/templates/users/edit.hbs   | 1 -
 translations/de.yaml             | 1 -
 translations/en.yaml             | 1 -
 4 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/addon/controllers/users/index.js b/addon/controllers/users/index.js
index d780e076..83d4adb8 100644
--- a/addon/controllers/users/index.js
+++ b/addon/controllers/users/index.js
@@ -24,7 +24,7 @@ export default class UsersIndexController extends PaginationController {
   }
 
   @task
-  @confirmTask({ message: "emeis.form.confirmUserDelete" })
+  @confirmTask({ message: "emeis.form.confirmEntryDelete" })
   @handleTaskErrors({ errorMessage: "emeis.form.delete-error" })
   *delete(model) {
     yield model.destroyRecord();
diff --git a/addon/templates/users/edit.hbs b/addon/templates/users/edit.hbs
index 2ea3cd48..f27151ba 100644
--- a/addon/templates/users/edit.hbs
+++ b/addon/templates/users/edit.hbs
@@ -8,7 +8,6 @@
       <EditForm
         @model={{@model}}
         @updateModel={{this.updateModel}}
-        @noDelete={{true}}
         @listViewRouteName="users.index"
       >
         {{#unless this.emailAsUsername}}
diff --git a/translations/de.yaml b/translations/de.yaml
index 80841ef0..a1376dd5 100644
--- a/translations/de.yaml
+++ b/translations/de.yaml
@@ -75,7 +75,6 @@ emeis:
     cancel: "Abbrechen"
     confirmText: "Sind Sie sich sicher, dass Sie diese Aktion fortfahren wollen?"
     confirmEntryDelete: "Sind Sie sich sicher, dass Sie diesen Eintrag löschen wollen?"
-    confirmUserDelete: "Sind Sie sich sicher, dass Sie diesen Benutzer löschen wollen?"
     save-success: "Erfolgreich gespeichert."
     delete-success: "Erfolgreich gelöscht."
     save-error: "Während dem Speichern ist ein Fehler aufgetretten. Bitte versuchen Sie es erneut."
diff --git a/translations/en.yaml b/translations/en.yaml
index 60321ca6..b47de4ec 100644
--- a/translations/en.yaml
+++ b/translations/en.yaml
@@ -75,7 +75,6 @@ emeis:
     cancel: "Cancel"
     confirmText: "Are you sure you want to proceed with this action?"
     confirmEntryDelete: "Are you sure you want to delete this entry?"
-    confirmUserDelete: "Are you sure you want to delete this user?"
     save-success: "Saved successfully"
     delete-success: "Deleted successfully"
     save-error: "A problem occurred while saving. Please try again."