From a352a351bf68d4df55b04781332aa475af6f40ee Mon Sep 17 00:00:00 2001 From: Matteo Pagliazzi Date: Sat, 27 Jun 2020 19:42:24 +0200 Subject: [PATCH] Merge https://github.com/HabitRPG/habitica/pull/12338 "Added the task type to the Delete alert window" by @Shuyinsama Squashed commit of the following: commit 0c05ff510e4bd0d7161c49245dd11e6abe882d96 Author: Matteo Pagliazzi Date: Sat Jun 27 19:41:58 2020 +0200 fix lint commit 2e1e1e4071d57fa2853a4a8f481c94bd5836037f Merge: cbc9af4ef5 fc46d73b1d Author: Matteo Pagliazzi Date: Sat Jun 27 19:39:58 2020 +0200 Merge branch 'feature/Deleting-a-reward-asks-you-if-you-want-to-delete-the-task' of https://github.com/Shuyinsama/habitica into Shuyinsama-feature/Deleting-a-reward-asks-you-if-you-want-to-delete-the-task commit fc46d73b1d39a81dfc84fea0236350d3f09cd6c3 Author: Patrick van Zadel Date: Sat Jun 27 18:54:08 2020 +0200 Renamed keys and fixed a check in the modal commit ec5b765f5c72188597703c3630f750f8b1eed6b5 Author: Patrick van Zadel Date: Sat Jun 27 18:45:25 2020 +0200 Renamed translation keys commit f0837dc57133fbaffcc63f27a64568aaaed83c32 Author: Patrick van Zadel Date: Tue Jun 23 23:06:59 2020 +0200 Added the task type to the "Delete" alert window so it now asks if you want to delete the task of type Edited the "Delete this ..." button in the edit task modal to represent the task type --- website/client/src/components/tasks/task.vue | 3 ++- website/client/src/components/tasks/taskModal.vue | 7 +++++-- website/common/locales/en/tasks.json | 4 ++-- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/website/client/src/components/tasks/task.vue b/website/client/src/components/tasks/task.vue index ea8ae7a12c..7e64c3972f 100644 --- a/website/client/src/components/tasks/task.vue +++ b/website/client/src/components/tasks/task.vue @@ -1013,7 +1013,8 @@ export default { this.$emit('moveTo', this.task, 'bottom'); }, destroy () { - if (!window.confirm(this.$t('sureDelete'))) return; + const type = this.$t(this.task.type); + if (!window.confirm(this.$t('sureDeleteType', { type }))) return; this.destroyTask(this.task); this.$emit('taskDestroyed', this.task); }, diff --git a/website/client/src/components/tasks/taskModal.vue b/website/client/src/components/tasks/taskModal.vue index 9e080f625a..948f45b2de 100644 --- a/website/client/src/components/tasks/taskModal.vue +++ b/website/client/src/components/tasks/taskModal.vue @@ -707,7 +707,9 @@ class="svg-icon d-inline-b mt-1 mb-1" v-html="icons.destroy" > - {{ $t('deleteTask') }} + + {{ $t('deleteTaskType', { type: $t(task.type) }) }} + @@ -1455,7 +1457,8 @@ export default { this.$root.$emit('bv::hide::modal', 'task-modal'); }, destroy () { - if (!window.confirm(this.$t('sureDelete'))) return; + const type = this.$t(this.task.type); + if (!window.confirm(this.$t('sureDeleteType', { type }))) return; this.destroyTask(this.task); this.$emit('taskDestroyed', this.task); this.$root.$emit('bv::hide::modal', 'task-modal'); diff --git a/website/common/locales/en/tasks.json b/website/common/locales/en/tasks.json index da4d991c15..b511cf5a44 100644 --- a/website/common/locales/en/tasks.json +++ b/website/common/locales/en/tasks.json @@ -122,8 +122,8 @@ "fortifyText": "Fortify will return all your tasks, except challenge tasks, to a neutral (yellow) state, as if you'd just added them, and top your Health off to full. This is great if all your red tasks are making the game too hard, or all your blue tasks are making the game too easy. If starting fresh sounds much more motivating, spend the Gems and catch a reprieve!", "confirmFortify": "Are you sure?", "fortifyComplete": "Fortify complete!", - "deleteTask": "Delete this Task", - "sureDelete": "Are you sure you want to delete this task?", + "deleteTaskType": "Delete this <%= type %>", + "sureDeleteType": "Are you sure you want to delete this <%= type %>?", "streakCoins": "Streak Bonus!", "taskToTop": "To top", "taskToBottom": "To bottom",