From 4e61185136f9e971b7b9a85dfd06acb5cbcc57d5 Mon Sep 17 00:00:00 2001
From: Lars Kiesow <lkiesow@uos.de>
Date: Thu, 29 Dec 2022 21:29:11 +0100
Subject: [PATCH 1/2] Fix keyboard navigation in user settings

This patch makes sure that the option in the user settings are
accessible via keyboard navigation and that the labels, if users use a
screen reader, actually make sense.

This patch introduces new strings which need to be translated. Although
I did already provide a German translation.
---
 client/components/tables/UsersTable.vue | 6 +++---
 client/strings/de.json                  | 2 ++
 client/strings/en-us.json               | 2 ++
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/client/components/tables/UsersTable.vue b/client/components/tables/UsersTable.vue
index a3b99ae8..2f19a7ba 100644
--- a/client/components/tables/UsersTable.vue
+++ b/client/components/tables/UsersTable.vue
@@ -35,13 +35,13 @@
             </ui-tooltip>
           </td>
           <td class="py-0">
-            <div class="w-full flex justify-center">
+            <div class="w-full flex justify-left">
               <!-- Dont show edit for non-root users -->
               <div v-if="user.type !== 'root' || userIsRoot" class="h-8 w-8 flex items-center justify-center text-white text-opacity-50 hover:text-opacity-100 cursor-pointer" @click.stop="editUser(user)">
-                <span class="material-icons text-base">edit</span>
+                <button :aria-label="$getString('ButtonUserEdit', [user.username])" class="material-icons text-base">edit</button>
               </div>
               <div v-show="user.type !== 'root'" class="h-8 w-8 flex items-center justify-center text-white text-opacity-50 hover:text-error cursor-pointer" @click.stop="deleteUserClick(user)">
-                <span class="material-icons text-base">delete</span>
+                <button :aria-label="$getString('ButtonUserDelete', [user.username])" class="material-icons text-base">delete</button>
               </div>
             </div>
           </td>
diff --git a/client/strings/de.json b/client/strings/de.json
index b307859c..ab043941 100644
--- a/client/strings/de.json
+++ b/client/strings/de.json
@@ -75,6 +75,8 @@
   "ButtonUploadBackup": "Sicherung hochladen",
   "ButtonUploadCover": "Titelbild hochladen",
   "ButtonUploadOPMLFile": "OPML-Datei hochladen",
+  "ButtonUserEdit": "Benutzer {0} editieren",
+  "ButtonUserDelete": "Benutzer {0} löschen",
   "ButtonViewAll": "Alles anzeigen",
   "ButtonYes": "Ja",
   "HeaderAccount": "Konto",
diff --git a/client/strings/en-us.json b/client/strings/en-us.json
index 7b986bf4..3b46b1e6 100644
--- a/client/strings/en-us.json
+++ b/client/strings/en-us.json
@@ -75,6 +75,8 @@
   "ButtonUploadBackup": "Upload Backup",
   "ButtonUploadCover": "Upload Cover",
   "ButtonUploadOPMLFile": "Upload OPML File",
+  "ButtonUserEdit": "Edit user {0}",
+  "ButtonUserDelete": "Delete user {0}",
   "ButtonViewAll": "View All",
   "ButtonYes": "Yes",
   "HeaderAccount": "Account",

From 4cd9088a661b29b76027dee98bbd62fde14a7807 Mon Sep 17 00:00:00 2001
From: advplyr <advplyr@protonmail.com>
Date: Fri, 30 Dec 2022 16:27:21 -0600
Subject: [PATCH 2/2] Add translations for aria labels #1166

---
 client/strings/de.json    | 4 ++--
 client/strings/en-us.json | 2 +-
 client/strings/es.json    | 2 ++
 client/strings/fr.json    | 4 +++-
 client/strings/hr.json    | 2 ++
 client/strings/it.json    | 4 +++-
 client/strings/pl.json    | 2 ++
 client/strings/zh-cn.json | 4 +++-
 8 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/client/strings/de.json b/client/strings/de.json
index ab043941..ea395249 100644
--- a/client/strings/de.json
+++ b/client/strings/de.json
@@ -75,8 +75,8 @@
   "ButtonUploadBackup": "Sicherung hochladen",
   "ButtonUploadCover": "Titelbild hochladen",
   "ButtonUploadOPMLFile": "OPML-Datei hochladen",
-  "ButtonUserEdit": "Benutzer {0} editieren",
   "ButtonUserDelete": "Benutzer {0} löschen",
+  "ButtonUserEdit": "Benutzer {0} editieren",
   "ButtonViewAll": "Alles anzeigen",
   "ButtonYes": "Ja",
   "HeaderAccount": "Konto",
@@ -617,4 +617,4 @@
   "WeekdayThursday": "Donnerstag",
   "WeekdayTuesday": "Dienstag",
   "WeekdayWednesday": "Mittwoch"
-}
+}
\ No newline at end of file
diff --git a/client/strings/en-us.json b/client/strings/en-us.json
index 3b46b1e6..85e504bb 100644
--- a/client/strings/en-us.json
+++ b/client/strings/en-us.json
@@ -75,8 +75,8 @@
   "ButtonUploadBackup": "Upload Backup",
   "ButtonUploadCover": "Upload Cover",
   "ButtonUploadOPMLFile": "Upload OPML File",
-  "ButtonUserEdit": "Edit user {0}",
   "ButtonUserDelete": "Delete user {0}",
+  "ButtonUserEdit": "Edit user {0}",
   "ButtonViewAll": "View All",
   "ButtonYes": "Yes",
   "HeaderAccount": "Account",
diff --git a/client/strings/es.json b/client/strings/es.json
index 7b986bf4..85e504bb 100644
--- a/client/strings/es.json
+++ b/client/strings/es.json
@@ -75,6 +75,8 @@
   "ButtonUploadBackup": "Upload Backup",
   "ButtonUploadCover": "Upload Cover",
   "ButtonUploadOPMLFile": "Upload OPML File",
+  "ButtonUserDelete": "Delete user {0}",
+  "ButtonUserEdit": "Edit user {0}",
   "ButtonViewAll": "View All",
   "ButtonYes": "Yes",
   "HeaderAccount": "Account",
diff --git a/client/strings/fr.json b/client/strings/fr.json
index e71da10b..28f380d9 100644
--- a/client/strings/fr.json
+++ b/client/strings/fr.json
@@ -75,6 +75,8 @@
   "ButtonUploadBackup": "Téléverser une Sauvegarde",
   "ButtonUploadCover": "Téléverser une Couverture",
   "ButtonUploadOPMLFile": "Téléverser un Fichier OPML",
+  "ButtonUserDelete": "Delete user {0}",
+  "ButtonUserEdit": "Edit user {0}",
   "ButtonViewAll": "Afficher tout",
   "ButtonYes": "Oui",
   "HeaderAccount": "Compte",
@@ -615,4 +617,4 @@
   "WeekdayThursday": "Jeudi",
   "WeekdayTuesday": "Mardi",
   "WeekdayWednesday": "Mercredi"
-}
+}
\ No newline at end of file
diff --git a/client/strings/hr.json b/client/strings/hr.json
index 2beaa5aa..2da5d581 100644
--- a/client/strings/hr.json
+++ b/client/strings/hr.json
@@ -75,6 +75,8 @@
   "ButtonUploadBackup": "Upload backup",
   "ButtonUploadCover": "Upload Cover",
   "ButtonUploadOPMLFile": "Upload OPML Datoteku",
+  "ButtonUserDelete": "Delete user {0}",
+  "ButtonUserEdit": "Edit user {0}",
   "ButtonViewAll": "Prikaži sve",
   "ButtonYes": "Da",
   "HeaderAccount": "Korisnički račun",
diff --git a/client/strings/it.json b/client/strings/it.json
index 06801a6b..3dcaf76c 100644
--- a/client/strings/it.json
+++ b/client/strings/it.json
@@ -75,6 +75,8 @@
   "ButtonUploadBackup": "Carica Backup",
   "ButtonUploadCover": "Carica Cover",
   "ButtonUploadOPMLFile": "Carica File OPML",
+  "ButtonUserDelete": "Delete user {0}",
+  "ButtonUserEdit": "Edit user {0}",
   "ButtonViewAll": "Mostra Tutto",
   "ButtonYes": "Si",
   "HeaderAccount": "Account",
@@ -615,4 +617,4 @@
   "WeekdayThursday": "Giovedi",
   "WeekdayTuesday": "Martedì",
   "WeekdayWednesday": "Mercoledì"
-}
+}
\ No newline at end of file
diff --git a/client/strings/pl.json b/client/strings/pl.json
index fa1e251a..87409fff 100644
--- a/client/strings/pl.json
+++ b/client/strings/pl.json
@@ -75,6 +75,8 @@
   "ButtonUploadBackup": "Wgraj kopię zapasową",
   "ButtonUploadCover": "Wgraj okładkę",
   "ButtonUploadOPMLFile": "Wgraj plik OPML",
+  "ButtonUserDelete": "Delete user {0}",
+  "ButtonUserEdit": "Edit user {0}",
   "ButtonViewAll": "Zobacz wszystko",
   "ButtonYes": "Tak",
   "HeaderAccount": "Konto",
diff --git a/client/strings/zh-cn.json b/client/strings/zh-cn.json
index 84df4ffe..741f2674 100644
--- a/client/strings/zh-cn.json
+++ b/client/strings/zh-cn.json
@@ -75,6 +75,8 @@
   "ButtonUploadBackup": "上传备份",
   "ButtonUploadCover": "上传封面",
   "ButtonUploadOPMLFile": "上传 OPML 文件",
+  "ButtonUserDelete": "Delete user {0}",
+  "ButtonUserEdit": "Edit user {0}",
   "ButtonViewAll": "查看全部",
   "ButtonYes": "确定",
   "HeaderAccount": "帐户",
@@ -615,4 +617,4 @@
   "WeekdayThursday": "星期四",
   "WeekdayTuesday": "星期二",
   "WeekdayWednesday": "星期三"
-}
+}
\ No newline at end of file