From d368ce6085c42ccf73c8aebfe57200084740b884 Mon Sep 17 00:00:00 2001 From: MeiMei <30769358+mei23@users.noreply.github.com> Date: Mon, 5 Aug 2019 10:30:31 +0900 Subject: [PATCH] Resolve #5247 (#5248) --- locales/ja-JP.yml | 1 + src/client/app/common/scripts/note-mixin.ts | 15 +++++++++++++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml index d0a06e976..857e97a22 100644 --- a/locales/ja-JP.yml +++ b/locales/ja-JP.yml @@ -37,6 +37,7 @@ common: reload-to-apply-the-setting: "この設定を反映するにはページをリロードする必要があります。今すぐリロードしますか?" fetching-as-ap-object: "連合に照会中" unfollow-confirm: "{name}さんをフォロー解除しますか?" + delete-confirm: "この投稿を削除しますか?" signin-required: "ログインしてください" notification-type: "通知の種類" notification-types: diff --git a/src/client/app/common/scripts/note-mixin.ts b/src/client/app/common/scripts/note-mixin.ts index fc82e78ce..e433ba49c 100644 --- a/src/client/app/common/scripts/note-mixin.ts +++ b/src/client/app/common/scripts/note-mixin.ts @@ -4,6 +4,7 @@ import shouldMuteNote from './should-mute-note'; import MkNoteMenu from '../views/components/note-menu.vue'; import MkReactionPicker from '../views/components/reaction-picker.vue'; import pleaseLogin from './please-login'; +import i18n from '../../i18n'; function focus(el, fn) { const target = fn(el); @@ -21,6 +22,8 @@ type Opts = { }; export default (opts: Opts = {}) => ({ + i18n: i18n(), + data() { return { showContent: false, @@ -175,8 +178,16 @@ export default (opts: Opts = {}) => ({ }, del() { - this.$root.api('notes/delete', { - noteId: this.appearNote.id + this.$root.dialog({ + type: 'warning', + text: this.$t('@.delete-confirm'), + showCancelButton: true + }).then(({ canceled }) => { + if (canceled) return; + + this.$root.api('notes/delete', { + noteId: this.appearNote.id + }); }); },