From 7056778872380324f4b1f50f3e0fb95acfff00d0 Mon Sep 17 00:00:00 2001
From: Jason Henriquez <jasonhenriquez@protonmail.com>
Date: Wed, 22 Nov 2023 23:53:57 -0600
Subject: [PATCH] Improve destructive action label clarity

---
 .../experimental-settings.vue                      |  4 ++--
 .../ft-profile-channel-list.js                     |  8 ++++----
 .../components/ft-profile-edit/ft-profile-edit.js  | 10 +++++-----
 .../privacy-settings/privacy-settings.js           | 14 +++++++-------
 .../components/theme-settings/theme-settings.js    | 10 +++++-----
 static/locales/en-US.yaml                          |  3 +++
 6 files changed, 26 insertions(+), 23 deletions(-)

diff --git a/src/renderer/components/experimental-settings/experimental-settings.vue b/src/renderer/components/experimental-settings/experimental-settings.vue
index d5f281e74..f5f77afb1 100644
--- a/src/renderer/components/experimental-settings/experimental-settings.vue
+++ b/src/renderer/components/experimental-settings/experimental-settings.vue
@@ -19,8 +19,8 @@
     <ft-prompt
       v-if="showRestartPrompt"
       :label="$t('Settings[\'The app needs to restart for changes to take effect. Restart and apply change?\']')"
-      :option-names="[$t('Yes'), $t('No')]"
-      :option-values="['yes', 'no']"
+      :option-names="[$t('Yes, Restart'), $t('Cancel')]"
+      :option-values="['restart', 'cancel']"
       :is-first-option-destructive="true"
       @click="handleReplaceHttpCache"
     />
diff --git a/src/renderer/components/ft-profile-channel-list/ft-profile-channel-list.js b/src/renderer/components/ft-profile-channel-list/ft-profile-channel-list.js
index 971382b0f..da36605cf 100644
--- a/src/renderer/components/ft-profile-channel-list/ft-profile-channel-list.js
+++ b/src/renderer/components/ft-profile-channel-list/ft-profile-channel-list.js
@@ -34,8 +34,8 @@ export default defineComponent({
       subscriptions: [],
       selectedLength: 0,
       deletePromptValues: [
-        'yes',
-        'no'
+        'delete',
+        'cancel'
       ]
     }
   },
@@ -61,8 +61,8 @@ export default defineComponent({
     },
     deletePromptNames: function () {
       return [
-        this.$t('Yes'),
-        this.$t('No')
+        this.$t('Yes, Delete'),
+        this.$t('Cancel')
       ]
     },
     locale: function () {
diff --git a/src/renderer/components/ft-profile-edit/ft-profile-edit.js b/src/renderer/components/ft-profile-edit/ft-profile-edit.js
index e6f4eddce..35835f050 100644
--- a/src/renderer/components/ft-profile-edit/ft-profile-edit.js
+++ b/src/renderer/components/ft-profile-edit/ft-profile-edit.js
@@ -36,8 +36,8 @@ export default defineComponent({
       profileBgColor: '',
       profileTextColor: '',
       deletePromptValues: [
-        'yes',
-        'no'
+        'delete',
+        'cancel'
       ]
     }
   },
@@ -62,8 +62,8 @@ export default defineComponent({
     },
     deletePromptNames: function () {
       return [
-        this.$t('Yes'),
-        this.$t('No')
+        this.$t('Yes, Delete'),
+        this.$t('Cancel')
       ]
     }
   },
@@ -84,7 +84,7 @@ export default defineComponent({
     },
 
     handleDeletePrompt: function (response) {
-      if (response === 'yes') {
+      if (response === 'delete') {
         this.deleteProfile()
       } else {
         this.showDeletePrompt = false
diff --git a/src/renderer/components/privacy-settings/privacy-settings.js b/src/renderer/components/privacy-settings/privacy-settings.js
index 0b541e0a5..2010015da 100644
--- a/src/renderer/components/privacy-settings/privacy-settings.js
+++ b/src/renderer/components/privacy-settings/privacy-settings.js
@@ -23,8 +23,8 @@ export default defineComponent({
       showRemoveHistoryPrompt: false,
       showRemoveSubscriptionsPrompt: false,
       promptValues: [
-        'yes',
-        'no'
+        'delete',
+        'cancel'
       ]
     }
   },
@@ -50,8 +50,8 @@ export default defineComponent({
     },
     promptNames: function () {
       return [
-        this.$t('Yes'),
-        this.$t('No')
+        this.$t('Yes, Delete'),
+        this.$t('Cancel')
       ]
     }
   },
@@ -59,7 +59,7 @@ export default defineComponent({
     handleSearchCache: function (option) {
       this.showSearchCachePrompt = false
 
-      if (option === 'yes') {
+      if (option === 'delete') {
         this.clearSessionSearchHistory()
         showToast(this.$t('Settings.Privacy Settings.Search cache has been cleared'))
       }
@@ -83,7 +83,7 @@ export default defineComponent({
     handleRemoveHistory: function (option) {
       this.showRemoveHistoryPrompt = false
 
-      if (option === 'yes') {
+      if (option === 'delete') {
         this.removeAllHistory()
         showToast(this.$t('Settings.Privacy Settings.Watch history has been cleared'))
       }
@@ -94,7 +94,7 @@ export default defineComponent({
 
       this.updateActiveProfile(MAIN_PROFILE_ID)
 
-      if (option !== 'yes') { return }
+      if (option !== 'delete') { return }
 
       this.profileList.forEach((profile) => {
         if (profile._id === MAIN_PROFILE_ID) {
diff --git a/src/renderer/components/theme-settings/theme-settings.js b/src/renderer/components/theme-settings/theme-settings.js
index 090a6dc89..ce6e8e670 100644
--- a/src/renderer/components/theme-settings/theme-settings.js
+++ b/src/renderer/components/theme-settings/theme-settings.js
@@ -26,8 +26,8 @@ export default defineComponent({
       disableSmoothScrollingToggleValue: false,
       showRestartPrompt: false,
       restartPromptValues: [
-        'yes',
-        'no'
+        'restart',
+        'cancel'
       ],
       baseThemeValues: [
         'system',
@@ -88,8 +88,8 @@ export default defineComponent({
 
     restartPromptNames: function () {
       return [
-        this.$t('Yes'),
-        this.$t('No')
+        this.$t('Yes, Restart'),
+        this.$t('Cancel')
       ]
     },
 
@@ -146,7 +146,7 @@ export default defineComponent({
     handleSmoothScrolling: function (value) {
       this.showRestartPrompt = false
 
-      if (value === null || value === 'no') {
+      if (value === null || value === 'cancel') {
         this.disableSmoothScrollingToggleValue = !this.disableSmoothScrollingToggleValue
         return
       }
diff --git a/static/locales/en-US.yaml b/static/locales/en-US.yaml
index 81d442062..c95f75ec3 100644
--- a/static/locales/en-US.yaml
+++ b/static/locales/en-US.yaml
@@ -939,3 +939,6 @@ Hashtag:
 Yes: Yes
 No: No
 Ok: Ok
+Yes, Delete: Yes, Delete
+Yes, Restart: Yes, Restart
+Cancel: Cancel