From 75d766499f7b96800f09331ec9b5ed3a93a75fa7 Mon Sep 17 00:00:00 2001
From: Kris <kris.aubuchon@discourse.org>
Date: Tue, 2 Feb 2021 15:46:48 -0500
Subject: [PATCH] Update a couple buttons to use correct markup (#11926)

---
 .../controllers/modals/admin-merge-users-confirmation.js  | 7 +++++++
 .../addon/controllers/modals/admin-merge-users-prompt.js  | 8 ++++++++
 .../templates/modal/admin-merge-users-confirmation.hbs    | 5 ++---
 .../addon/templates/modal/admin-merge-users-prompt.hbs    | 5 ++---
 4 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/app/assets/javascripts/admin/addon/controllers/modals/admin-merge-users-confirmation.js b/app/assets/javascripts/admin/addon/controllers/modals/admin-merge-users-confirmation.js
index 48be2946bc4..7c37ddd0179 100644
--- a/app/assets/javascripts/admin/addon/controllers/modals/admin-merge-users-confirmation.js
+++ b/app/assets/javascripts/admin/addon/controllers/modals/admin-merge-users-confirmation.js
@@ -22,6 +22,13 @@ export default Controller.extend(ModalFunctionality, {
     });
   },
 
+  @discourseComputed("username")
+  mergeButtonText(username) {
+    return I18n.t(`admin.user.merge.confirmation.transfer_and_delete`, {
+      username,
+    });
+  },
+
   @discourseComputed("value", "text")
   mergeDisabled(value, text) {
     return !value || text !== value;
diff --git a/app/assets/javascripts/admin/addon/controllers/modals/admin-merge-users-prompt.js b/app/assets/javascripts/admin/addon/controllers/modals/admin-merge-users-prompt.js
index 98f60d23951..46e23305f2b 100644
--- a/app/assets/javascripts/admin/addon/controllers/modals/admin-merge-users-prompt.js
+++ b/app/assets/javascripts/admin/addon/controllers/modals/admin-merge-users-prompt.js
@@ -1,4 +1,5 @@
 import Controller, { inject as controller } from "@ember/controller";
+import I18n from "I18n";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
 import { action, get } from "@ember/object";
 import { alias } from "@ember/object/computed";
@@ -17,6 +18,13 @@ export default Controller.extend(ModalFunctionality, {
     return !targetUsername || username === targetUsername;
   },
 
+  @discourseComputed("username")
+  mergeButtonText(username) {
+    return I18n.t(`admin.user.merge.confirmation.transfer_and_delete`, {
+      username,
+    });
+  },
+
   @action
   showConfirmation() {
     this.send("closeModal");
diff --git a/app/assets/javascripts/admin/addon/templates/modal/admin-merge-users-confirmation.hbs b/app/assets/javascripts/admin/addon/templates/modal/admin-merge-users-confirmation.hbs
index b2522607b53..fc07ea1f19f 100644
--- a/app/assets/javascripts/admin/addon/templates/modal/admin-merge-users-confirmation.hbs
+++ b/app/assets/javascripts/admin/addon/templates/modal/admin-merge-users-confirmation.hbs
@@ -5,14 +5,13 @@
   {{/d-modal-body}}
 
   <div class="modal-footer">
-    {{#d-button
+    {{d-button
       class="btn-danger"
       action=(action "confirm")
       icon="trash-alt"
       disabled=mergeDisabled
+      translatedLabel=mergeButtonText
     }}
-      {{i18n "admin.user.merge.confirmation.transfer_and_delete" username=username}}
-    {{/d-button}}
     {{d-button
       action=(action "close")
       label="admin.user.merge.confirmation.cancel"
diff --git a/app/assets/javascripts/admin/addon/templates/modal/admin-merge-users-prompt.hbs b/app/assets/javascripts/admin/addon/templates/modal/admin-merge-users-prompt.hbs
index 6fea5ee4f0e..196c375d2c4 100644
--- a/app/assets/javascripts/admin/addon/templates/modal/admin-merge-users-prompt.hbs
+++ b/app/assets/javascripts/admin/addon/templates/modal/admin-merge-users-prompt.hbs
@@ -13,14 +13,13 @@
   {{/d-modal-body}}
 
   <div class="modal-footer">
-    {{#d-button
+    {{d-button
       class="btn-primary"
       action=(action "showConfirmation")
       icon="trash-alt"
       disabled=mergeDisabled
+      translatedLabel=mergeButtonText
     }}
-      {{i18n "admin.user.merge.prompt.transfer_and_delete" username=username}}
-    {{/d-button}}
     {{d-button
       action=(action "close")
       label="admin.user.merge.prompt.cancel"