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}}