From 6adefc561994032f833af691efa6d2da60744533 Mon Sep 17 00:00:00 2001
From: FloatingGhost <hannah@coffee-and-dreams.uk>
Date: Fri, 26 Aug 2022 12:43:22 +0100
Subject: [PATCH] add default translation keys

---
 .../account_actions/account_actions.js        |  1 +
 .../account_actions/account_actions.vue       |  2 +-
 .../confirm_modal/confirm_modal.vue           | 22 ++++++++---
 src/components/extra_buttons/extra_buttons.js |  2 +-
 .../extra_buttons/extra_buttons.vue           |  2 +-
 src/components/mobile_nav/mobile_nav.js       |  1 +
 src/components/notification/notification.js   |  3 --
 .../settings_modal/tabs/general_tab.vue       | 24 ------------
 src/i18n/en.json                              | 38 ++++++++++++++++++-
 9 files changed, 58 insertions(+), 37 deletions(-)

diff --git a/src/components/account_actions/account_actions.js b/src/components/account_actions/account_actions.js
index 2a40c81c..c227c409 100644
--- a/src/components/account_actions/account_actions.js
+++ b/src/components/account_actions/account_actions.js
@@ -2,6 +2,7 @@ import ProgressButton from '../progress_button/progress_button.vue'
 import Popover from '../popover/popover.vue'
 import ConfirmModal from '../confirm_modal/confirm_modal.vue'
 import { library } from '@fortawesome/fontawesome-svg-core'
+import { mapState } from 'vuex'
 import {
   faEllipsisV
 } from '@fortawesome/free-solid-svg-icons'
diff --git a/src/components/account_actions/account_actions.vue b/src/components/account_actions/account_actions.vue
index e29db83a..3e65aa62 100644
--- a/src/components/account_actions/account_actions.vue
+++ b/src/components/account_actions/account_actions.vue
@@ -72,7 +72,7 @@
           keypath="user_card.block_confirm"
           tag="span"
         >
-          <template #user>
+          <template v-slot:user>
             <span
               v-text="user.screen_name_ui"
             />
diff --git a/src/components/confirm_modal/confirm_modal.vue b/src/components/confirm_modal/confirm_modal.vue
index 3b98174a..5783c794 100644
--- a/src/components/confirm_modal/confirm_modal.vue
+++ b/src/components/confirm_modal/confirm_modal.vue
@@ -11,19 +11,29 @@
     <slot />
 
     <template #footer>
-      <button
-        class="btn button-default"
-        @click.prevent="onAccept"
-        v-text="confirmText"
-      />
-
       <button
         class="btn button-default"
         @click.prevent="onCancel"
         v-text="cancelText"
       />
+      <button
+        class="btn button-default button-positive"
+        @click.prevent="onAccept"
+        v-text="confirmText"
+      />
     </template>
   </dialog-modal>
 </template>
 
+<style lang="scss" scoped>
+@import '../../_variables';
+
+.confirm-modal {
+  .button-positive {
+    border: 3px solid var(--accent, $fallback--link);
+    border-radius: var(--btnRadius, $fallback--btnRadius);
+  }
+}
+</style>
+
 <script src="./confirm_modal.js"></script>
diff --git a/src/components/extra_buttons/extra_buttons.js b/src/components/extra_buttons/extra_buttons.js
index 34f4ccd8..f7045110 100644
--- a/src/components/extra_buttons/extra_buttons.js
+++ b/src/components/extra_buttons/extra_buttons.js
@@ -47,7 +47,7 @@ const ExtraButtons = {
     },
     doDeleteStatus () {
       this.$store.dispatch('deleteStatus', { id: this.status.id })
-      hideDeleteStatusConfirmDialog()
+      this.hideDeleteStatusConfirmDialog()
     },
     showDeleteStatusConfirmDialog () {
       this.showingDeleteDialog = true
diff --git a/src/components/extra_buttons/extra_buttons.vue b/src/components/extra_buttons/extra_buttons.vue
index 8ef677bb..2b574bbd 100644
--- a/src/components/extra_buttons/extra_buttons.vue
+++ b/src/components/extra_buttons/extra_buttons.vue
@@ -124,7 +124,7 @@
           class="fa-scale-110 fa-old-padding"
           icon="ellipsis-h"
         />
-      </span>
+      </button>
       <teleport to="#modal">
         <ConfirmModal
           v-if="showingDeleteDialog"
diff --git a/src/components/mobile_nav/mobile_nav.js b/src/components/mobile_nav/mobile_nav.js
index 0d4f6f3b..bba520d4 100644
--- a/src/components/mobile_nav/mobile_nav.js
+++ b/src/components/mobile_nav/mobile_nav.js
@@ -3,6 +3,7 @@ import Notifications from '../notifications/notifications.vue'
 import ConfirmModal from '../confirm_modal/confirm_modal.vue'
 import { unseenNotificationsFromStore } from '../../services/notification_utils/notification_utils'
 import GestureService from '../../services/gesture_service/gesture_service'
+import { mapGetters } from 'vuex'
 import { library } from '@fortawesome/fontawesome-svg-core'
 import {
   faTimes,
diff --git a/src/components/notification/notification.js b/src/components/notification/notification.js
index 0507459c..af612ccb 100644
--- a/src/components/notification/notification.js
+++ b/src/components/notification/notification.js
@@ -5,7 +5,6 @@ import UserAvatar from '../user_avatar/user_avatar.vue'
 import UserCard from '../user_card/user_card.vue'
 import Timeago from '../timeago/timeago.vue'
 import RichContent from 'src/components/rich_content/rich_content.jsx'
-import UserPopover from '../user_popover/user_popover.vue'
 import ConfirmModal from '../confirm_modal/confirm_modal.vue'
 import { isStatusNotification } from '../../services/notification_utils/notification_utils.js'
 import { highlightClass, highlightStyle } from '../../services/user_highlighter/user_highlighter.js'
@@ -50,9 +49,7 @@ const Notification = {
     UserCard,
     Timeago,
     Status,
-    Report,
     RichContent,
-    UserPopover,
     ConfirmModal
   },
   methods: {
diff --git a/src/components/settings_modal/tabs/general_tab.vue b/src/components/settings_modal/tabs/general_tab.vue
index 3d58f2bf..03838eb1 100644
--- a/src/components/settings_modal/tabs/general_tab.vue
+++ b/src/components/settings_modal/tabs/general_tab.vue
@@ -172,11 +172,6 @@
             {{ $t('settings.autohide_floating_post_button') }}
           </BooleanSetting>
         </li>
-        <li>
-          <BooleanSetting path="listsNavigation">
-            {{ $t('settings.lists_navigation') }}
-          </BooleanSetting>
-        </li>
         <li>
           <h3>{{ $t('settings.columns') }}</h3>
         </li>
@@ -205,20 +200,6 @@
             {{ $t('settings.third_column_mode') }}
           </ChoiceSetting>
         </li>
-        <li v-if="expertLevel > 0">
-          {{ $t('settings.column_sizes') }}
-          <div class="column-settings">
-            <SizeSetting
-              v-for="column in columns"
-              :key="column"
-              :path="column + 'ColumnWidth'"
-              :units="horizontalUnits"
-              expert="1"
-            >
-              {{ $t('settings.column_sizes_' + column) }}
-            </SizeSetting>
-          </div>
-        </li>
         <li class="select-multiple">
           <span class="label">{{ $t('settings.confirm_dialogs') }}</span>
           <ul class="option-list">
@@ -247,11 +228,6 @@
                 {{ $t('settings.confirm_dialogs_delete') }}
               </BooleanSetting>
             </li>
-            <li>
-              <BooleanSetting path="modalOnLogout">
-                {{ $t('settings.confirm_dialogs_logout') }}
-              </BooleanSetting>
-            </li>
             <li>
               <BooleanSetting path="modalOnApproveFollow">
                 {{ $t('settings.confirm_dialogs_approve_follow') }}
diff --git a/src/i18n/en.json b/src/i18n/en.json
index 84e4a185..fc12eef9 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -394,7 +394,16 @@
         "chatMessageRadius": "Chat message",
         "checkboxRadius": "Checkboxes",
         "collapse_subject": "Collapse posts with subjects",
+        "columns": "Columns",
         "composing": "Composing",
+        "confirm_dialogs": "Require confirmation for:",
+        "confirm_dialogs_repeat": "Repeating a post",
+        "confirm_dialogs_unfollow": "Unfollowing someone",
+        "confirm_dialogs_block": "Blocking someone",
+        "confirm_dialogs_mute": "Muting someone",
+        "confirm_dialogs_delete": "Deleting a post",
+        "confirm_dialogs_approve_follow": "Accepting a follow request",
+        "confirm_dialogs_deny_follow": "Rejecting a follow request",
         "confirm_new_password": "Confirm new password",
         "conversation_display": "Conversation display style",
         "conversation_display_linear": "Linear-style",
@@ -819,6 +828,9 @@
         "copy_link": "Copy link to post",
         "delete": "Delete post",
         "delete_confirm": "Do you really want to delete this post?",
+        "delete_confirm_title": "Confirm deletion",
+        "delete_confirm_accept_button": "Yes, delete it",
+        "delete_confirm_cancel_button": "No, keep it",
         "expand": "Expand",
         "external_source": "External source",
         "favorites": "Favorites",
@@ -840,6 +852,10 @@
         "replies_list": "Replies:",
         "replies_list_with_others": "Replies (+{numReplies} other): | Replies (+{numReplies} others):",
         "reply_to": "Reply to",
+        "repeat_confirm": "Do you really want to repeat this post?",
+        "repeat_confirm_title": "Confirm repeat",
+        "repeat_confirm_accept_button": "Yes, repeat it",
+        "repeat_confirm_cancel_button": "No, don't repeat",
         "show_all_attachments": "Show all attachments",
         "show_all_conversation": "Show full conversation ({numStatus} other post) | Show full conversation ({numStatus} other posts)",
         "show_all_conversation_with_icon": "{icon} {text}",
@@ -948,12 +964,24 @@
             "strip_media": "Remove media from posts"
         },
         "approve": "Approve",
+        "approve_confirm_title": "Approve follow request",
+        "approve_confirm": "Are you sure you want to let this user follow you?",
+        "approve_confirm_accept_button": "Yes, accept",
+        "approve_confirm_cancel_button": "No, cancel",
         "block": "Block",
+        "block_confirm": "Are you sure you want to block {user}?",
+        "block_confirm_title": "Block user",
+        "block_confirm_cancel_button": "No, don't block",
+        "block_confirm_accept_button": "Yes, block",
         "block_progress": "Blocking…",
         "blocked": "Blocked!",
         "bot": "Bot",
         "deactivated": "Deactivated",
         "deny": "Deny",
+        "deny_confirm_title": "Deny follow request",
+        "deny_confirm": "Are you sure you want to deny this user's follow request?",
+        "deny_confirm_accept_button": "Yes, deny",
+        "deny_confirm_cancel_button": "No, cancel",
         "domain_muted": "Unblock domain",
         "edit_profile": "Edit profile",
         "favorites": "Favorites",
@@ -979,6 +1007,10 @@
         "mention": "Mention",
         "message": "Message",
         "mute": "Mute",
+        "mute_confirm": "Are you sure you want to mute {user}?",
+        "mute_confirm_title": "Mute user",
+        "mute_confirm_cancel_button": "No, don't mute",
+        "mute_confirm_accept_button": "Yes, mute",
         "mute_domain": "Block domain",
         "mute_progress": "Muting…",
         "muted": "Muted",
@@ -991,9 +1023,13 @@
         "subscribe": "Subscribe",
         "unblock": "Unblock",
         "unblock_progress": "Unblocking…",
+        "unfollow_confirm": "Are you sure you want to unfollow {user}?",
+        "unfollow_confirm_title": "Unfollow user",
+        "unfollow_confirm_cancel_button": "No, don't unfollow",
+        "unfollow_confirm_accept_button": "Yes, unfollow",
         "unmute": "Unmute",
         "unmute_progress": "Unmuting…",
-        "unsubscribe": "Unsubscribe"
+        "unsubscribe": "Unsubscribe",
     },
     "user_profile": {
         "profile_does_not_exist": "Sorry, this profile does not exist.",