github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-06-06 23:07:28 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Update a couple buttons to use correct markup (#11926)

Browse Source
This commit is contained in:
Kris
2021-02-02 15:46:48 -05:00
committed by GitHub
parent e8b82724fd
commit 75d766499f
4 changed files with 19 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/assets/javascripts/admin/addon/controllers/modals/admin-merge-users-prompt.js
View File

@ -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");