From b10b0334b7a636390c271ca0131385e9caa2f91a Mon Sep 17 00:00:00 2001
From: banaanihillo <banaanihillo@protonmail.ch>
Date: Thu, 9 May 2024 13:19:21 +0300
Subject: [PATCH] Keyboard handlers, aria labels, locales cleanup

---
 src/components/Playlists.vue |  8 ++++----
 src/components/Search.vue    |  6 +++---
 src/components/SongItem.vue  |  8 ++++----
 src/components/StatusBar.vue |  4 ++--
 src/locales/en.json          | 27 +++++++++++++--------------
 5 files changed, 26 insertions(+), 27 deletions(-)

diff --git a/src/components/Playlists.vue b/src/components/Playlists.vue
index 243b093..922667a 100644
--- a/src/components/Playlists.vue
+++ b/src/components/Playlists.vue
@@ -44,7 +44,7 @@ onMounted(() => {
         <button
           class="bi bi-shuffle pl-btn"
           title="shuffle queue"
-          :aria-label="t('playlist.shuffle_queue')"
+          :aria-label="t('queue.shuffle')"
           @click="
             () => {
               data.state.urls = useShuffle(data.state.urls);
@@ -53,8 +53,8 @@ onMounted(() => {
           "></button>
         <button
           class="bi bi-bookmark-plus pl-btn"
-          title="save queue"
-          :aria-label="t('playlist.save_queue')"
+          :title="t('playlist.save')"
+          :aria-label="t('playlist.save')"
           @click="
             () => {
               let urls = data.state.urls.map(i => ({
@@ -69,7 +69,7 @@ onMounted(() => {
         <button
           class="bi bi-dash-lg pl-btn"
           title="clear queue"
-          :aria-label="t('playlist.clear_queue')"
+          :aria-label="t('queue.clear')"
           @click="data.state.urls = []"></button>
       </div>
       <div
diff --git a/src/components/Search.vue b/src/components/Search.vue
index e681183..057a4ec 100644
--- a/src/components/Search.vue
+++ b/src/components/Search.vue
@@ -275,7 +275,7 @@ onDeactivated(() => {
             <button
               class="bi bi-bookmark-plus clickable"
               @click="saveAlbum"
-              :aria-label="t('action.save_album')"></button>
+              :aria-label="t('playlist.save')"></button>
 
             <button
               class="bi bi-share clickable"
@@ -293,7 +293,7 @@ onDeactivated(() => {
                   })),
                 )
               "
-              :aria-label="t('playlist.add_album_to_playlist')"></button>
+              :aria-label="t('queue.add')"></button>
 
             <button
               class="bi bi-shuffle clickable"
@@ -304,7 +304,7 @@ onDeactivated(() => {
               v-if="plId"
               class="bi bi-trash3 clickable"
               @click="removePlaylist"
-              :aria-label="t('action.remove_playlist')"></button>
+              :aria-label="t('playlist.remove')"></button>
           </div>
         </Transition>
       </template>
diff --git a/src/components/SongItem.vue b/src/components/SongItem.vue
index 9fd42b5..3286dec 100644
--- a/src/components/SongItem.vue
+++ b/src/components/SongItem.vue
@@ -145,15 +145,15 @@ const openSong = el => {
           <button
             v-if="playlistId || offlineUri"
             class="bi bi-dash-lg clickable ign"
-            :aria-label="t('action.remove_from_playlist')"
+            :aria-label="t('playlist.remove_from')"
             @click="Remove"></button>
           <button
             class="bi bi-chevron-bar-right clickable ign"
-            :aria-label="t('action.play_next')"
+            :aria-label="t('queue.add_to_top')"
             @click="appendSong"></button>
           <button
             class="bi bi-collection clickable ign"
-            :aria-label="t('action.add_current_to_playlist')"
+            :aria-label="t('playlist.add')"
             @click="showPl = true"></button>
           <button
             class="bi bi-broadcast clickable ign"
@@ -161,7 +161,7 @@ const openSong = el => {
             @click="$emit('nxt-song')"></button>
           <button
             class="bi bi-plus-lg clickable ign"
-            :aria-label="t('action.add_to_playlist')"
+            :aria-label="t('queue.add_to_bottom')"
             @click="addSong"></button>
           <button
             class="bi bi-share clickable ign"
diff --git a/src/components/StatusBar.vue b/src/components/StatusBar.vue
index feaf497..755a87f 100644
--- a/src/components/StatusBar.vue
+++ b/src/components/StatusBar.vue
@@ -223,8 +223,8 @@ async function Like() {
 
             <button
               id="addToPlaylist"
-              :title="t('action.add_current_to_playlist')"
-              :aria-label="t('action.add_current_to_playlist')"
+              :title="t('playlist.add')"
+              :aria-label="t('playlist.add')"
               class="bi bi-collection clickable"
               @click="
                 player.toggle('add');
diff --git a/src/locales/en.json b/src/locales/en.json
index 5d764fa..f297c3c 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -31,11 +31,7 @@
     "import": "Import",
     "export": "Export",
     "register_on": "Don't have an account? Register on",
-    "remove_from_playlist": "Remove from playlist",
-    "play_next": "Play next",
-    "add_current_to_playlist": "Add current track to a playlist",
     "play_now": "Play now",
-    "add_to_playlist": "Add to playlist",
     "share": "Share",
     "play_next_track": "Play next track",
     "change_time": "Change time",
@@ -44,22 +40,26 @@
     "show_information_about_track": "Show information about track",
     "more_controls": "More controls",
     "three-dots": "More controls",
-    "remove_playlist": "Remove playlist",
-    "shuffle": "Shuffle",
-    "save_album": "Save album"
+    "shuffle": "Shuffle"
   },
   "playlist": {
     "local": "Local Playlists",
     "remote": "Remote Playlists",
     "name": "Playlist name",
-    "add": "Add Songs to Playlist",
-    "add_album_to_playlist": "Add album to playlist",
+    "add": "Add to Playlist",
     "create": "Create a new Playlist",
     "sync": "Sync playlists",
     "select": "Select Playlist to Add",
-    "clear_queue": "Clear queue",
-    "save_queue": "Save queue",
-    "shuffle_queue": "Shuffle queue"
+    "remove_from": "Remove from playlist",
+    "remove": "Remove playlist",
+    "save": "Save as playlist"
+  },
+  "queue": {
+    "clear": "Clear queue",
+    "shuffle": "Shuffle queue",
+    "add": "Add to queue",
+    "add_to_top": "Add to top of queue",
+    "add_to_bottom": "Add to bottom of queue"
   },
   "artist": {
     "subscribers": "Subscribers",
@@ -125,8 +125,7 @@
   },
   "statusBar": {
     "currentPlaylist": "Current Playlist",
-    "loop": "Loop",
-    "add_current_to_playlist": "Add Current Song to a Playlist"
+    "loop": "Loop"
   },
   "general": {
     "username": "username",