From bd8cfc7b57a623a6bdf43ca3a8f430787d03f0db Mon Sep 17 00:00:00 2001
From: TAKAHASHI Shuuji <shuuji3@gmail.com>
Date: Sun, 21 Apr 2024 19:26:35 +0900
Subject: [PATCH] fix(i18n,a11y): fix missing or incorrect translations in
 `aria-label` strings (#2837)

---
 components/account/AccountMoreButton.vue | 2 +-
 components/help/HelpPreview.vue          | 2 +-
 components/modal/ModalMediaPreview.vue   | 6 +++---
 components/nav/button/MoreMenu.vue       | 2 +-
 components/report/ReportModal.vue        | 2 +-
 components/status/StatusAttachment.vue   | 2 +-
 components/user/UserPicker.vue           | 2 +-
 components/user/UserSwitcher.vue         | 2 +-
 locales/en.json                          | 1 +
 9 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/components/account/AccountMoreButton.vue b/components/account/AccountMoreButton.vue
index 628b8465..7b2fe672 100644
--- a/components/account/AccountMoreButton.vue
+++ b/components/account/AccountMoreButton.vue
@@ -56,7 +56,7 @@ async function removeUserNote() {
 
 <template>
   <CommonDropdown :eager-mount="command">
-    <button flex gap-1 items-center w-full rounded op75 hover="op100 text-purple" group aria-label="More actions">
+    <button flex gap-1 items-center w-full rounded op75 hover="op100 text-purple" group :aria-label="t('actions.more')">
       <div rounded-5 p2 elk-group-hover="bg-purple/10">
         <div i-ri:more-2-fill />
       </div>
diff --git a/components/help/HelpPreview.vue b/components/help/HelpPreview.vue
index b08aedc7..a6750393 100644
--- a/components/help/HelpPreview.vue
+++ b/components/help/HelpPreview.vue
@@ -8,7 +8,7 @@ const vAutoFocus = (el: HTMLElement) => el.focus()
 
 <template>
   <div my-8 px-3 sm:px-8 md:max-w-200 flex="~ col gap-4" relative>
-    <button v-auto-focus type="button" btn-action-icon absolute top--8 right-0 m1 aria-label="Close" @click="emit('close')">
+    <button v-auto-focus type="button" btn-action-icon absolute top--8 right-0 m1 :aria-label="$t('action.close')" @click="emit('close')">
       <span i-ri:close-line />
     </button>
 
diff --git a/components/modal/ModalMediaPreview.vue b/components/modal/ModalMediaPreview.vue
index 2670d0f8..03cbae6c 100644
--- a/components/modal/ModalMediaPreview.vue
+++ b/components/modal/ModalMediaPreview.vue
@@ -39,14 +39,14 @@ onUnmounted(() => locked.value = false)
 <template>
   <div relative h-full w-full flex pt-12 @click="onClick">
     <button
-      v-if="hasNext" pointer-events-auto btn-action-icon bg="black/20" :aria-label="$t('action.previous')"
+      v-if="hasNext" pointer-events-auto btn-action-icon bg="black/20" :aria-label="$t('action.next')"
       hover:bg="black/40" dark:bg="white/30" dark-hover:bg="white/20" absolute top="1/2" right-1 z5
       :title="$t('action.next')" @click="next"
     >
       <div i-ri:arrow-right-s-line text-white />
     </button>
     <button
-      v-if="hasPrev" pointer-events-auto btn-action-icon bg="black/20" aria-label="action.next"
+      v-if="hasPrev" pointer-events-auto btn-action-icon bg="black/20" :aria-label="$t('action.prev')"
       hover:bg="black/40" dark:bg="white/30" dark:hover-bg="white/20" absolute top="1/2" left-1 z5
       :title="$t('action.prev')" @click="prev"
     >
@@ -71,7 +71,7 @@ onUnmounted(() => locked.value = false)
 
     <div absolute top-0 w-full flex justify-end>
       <button
-        btn-action-icon bg="black/30" aria-label="action.close" hover:bg="black/40" dark:bg="white/30"
+        btn-action-icon bg="black/30" :aria-label="$t('action.close')" hover:bg="black/40" dark:bg="white/30"
         dark:hover-bg="white/20" pointer-events-auto shrink-0 @click="emit('close')"
       >
         <div i-ri:close-line text-white />
diff --git a/components/nav/button/MoreMenu.vue b/components/nav/button/MoreMenu.vue
index 75eb6716..a694c5aa 100644
--- a/components/nav/button/MoreMenu.vue
+++ b/components/nav/button/MoreMenu.vue
@@ -10,7 +10,7 @@ defineModel<boolean>()
     <button
       flex items-center place-content-center h-full flex-1 class="select-none"
       :class="show ? '!text-primary' : ''"
-      aria-label="More menu"
+      :aria-label="$t('nav.more_menu')"
       @click="toggleVisible"
     >
       <span :class="show ? 'i-ri:close-fill' : 'i-ri:more-fill'" />
diff --git a/components/report/ReportModal.vue b/components/report/ReportModal.vue
index 1bd73ee1..f540454c 100644
--- a/components/report/ReportModal.vue
+++ b/components/report/ReportModal.vue
@@ -97,7 +97,7 @@ function resetModal() {
         <b text-primary>@{{ account.acct }}</b>
       </i18n-t>
     </h2>
-    <button ref="dismissButton" btn-action-icon absolute top--8 right-0 m1 aria-label="Close" @click="emit('close')">
+    <button ref="dismissButton" btn-action-icon absolute top--8 right-0 m1 :aria-label="$t('action.close')" @click="emit('close')">
       <div i-ri:close-line />
     </button>
 
diff --git a/components/status/StatusAttachment.vue b/components/status/StatusAttachment.vue
index f59fad42..305c6885 100644
--- a/components/status/StatusAttachment.vue
+++ b/components/status/StatusAttachment.vue
@@ -211,7 +211,7 @@ watch(shouldLoadAttachment, () => {
         rounded-lg
         h-full
         w-full
-        aria-label="Open image preview dialog"
+        :aria-label="$t('action.open_image_preview_dialog')"
         relative
         @click="!shouldLoadAttachment ? loadAttachment() : openMediaPreview(attachments ? attachments : [attachment], attachments?.indexOf(attachment) || 0)"
       >
diff --git a/components/user/UserPicker.vue b/components/user/UserPicker.vue
index 1afdb73f..8efbaaec 100644
--- a/components/user/UserPicker.vue
+++ b/components/user/UserPicker.vue
@@ -20,7 +20,7 @@ function clickUser(user: UserLogin) {
           <button
             flex rounded
             cursor-pointer
-            aria-label="Switch user"
+            :aria-label="$t('action.switch_account')"
             :class="user.account.acct === currentUser?.account.acct ? '' : 'op25 grayscale'"
             hover="filter-none op100"
             @click="clickUser(user)"
diff --git a/components/user/UserSwitcher.vue b/components/user/UserSwitcher.vue
index 1160ab85..c075763e 100644
--- a/components/user/UserSwitcher.vue
+++ b/components/user/UserSwitcher.vue
@@ -36,7 +36,7 @@ function processSignIn() {
       <button
         flex rounded px4 py3 text-left
         hover:bg-active cursor-pointer transition-100
-        aria-label="Switch user"
+        :aria-label="$t('action.switch_account')"
         @click="clickUser(user)"
       >
         <AccountInfo :account="user.account" :hover-card="false" square />
diff --git a/locales/en.json b/locales/en.json
index 3f5194ad..77bc9708 100644
--- a/locales/en.json
+++ b/locales/en.json
@@ -73,6 +73,7 @@
     "favourited": "Favorited",
     "more": "More",
     "next": "Next",
+    "open_image_preview_dialog": "Open image preview dialog",
     "prev": "Prev",
     "publish": "Publish",
     "publish_thread": "Publish thread",