Fix translations for collaborator quick actions, correctly reference …

…store and hide avatar images for screenreaders
owncloud · Apr 28, 2021 · 07ce4b9 · 07ce4b9
1 parent 4e9e13d
commit 07ce4b9
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 8 deletions.
diff --git a/packages/web-app-files/src/components/Collaborators/Collaborator.vue b/packages/web-app-files/src/components/Collaborators/Collaborator.vue
@@ -9,7 +9,6 @@
             :width="48"
             :userid="collaborator.collaborator.name"
             :user-name="collaborator.collaborator.displayName"
-            :aria-label="$gettext('User')"
           />
           <div v-else key="collaborator-avatar-placeholder">
             <oc-icon
@@ -141,8 +140,8 @@
         <div class="uk-flex uk-flex-nowrap uk-flex-middle">
           <oc-button
             v-if="$_editButtonVisible"
-            :aria-label="$gettext(`Edit share with ${ collaborator.collaborator.displayName }`)"
-            :uk-tooltip="$gettext(`Edit share with ${ collaborator.collaborator.displayName }`)"
+            :aria-label="editShareHint"
+            :uk-tooltip="editShareHint"
             appearance="raw"
             class="files-collaborators-collaborator-edit"
             @click="$emit('onEdit', collaborator)"
@@ -152,8 +151,8 @@
           <div>
             <oc-button
               v-if="$_deleteButtonVisible"
-              :aria-label="$gettext(`Delete share with ${ collaborator.collaborator.displayName }`)"
-              :uk-tooltip="$gettext(`Delete share with ${ collaborator.collaborator.displayName }`)"
+              :aria-label="deleteShareHint"
+              :uk-tooltip="deleteShareHint"
               appearance="raw"
               class="files-collaborators-collaborator-delete"
               @click="$_removeShare"
@@ -223,6 +222,16 @@ export default {
       return this.modifiable && !this.removalInProgress
     },
 
+    editShareHint() {
+      let translated = this.$gettext('Edit share with %{ currentCollaborator }')
+      return this.$gettextInterpolate(translated, { currentCollaborator: this.collaborator.collaborator.displayName }, true)
+    },
+
+    deleteShareHint() {
+      let translated = this.$gettext('Delete share with %{ currentCollaborator }')
+      return this.$gettextInterpolate(translated, { currentCollaborator: this.collaborator.collaborator.displayName }, true)
+    },
+
     isIndirectShare() {
       // it is assumed that the "incoming" attribute only exists
       // on shares coming from this.collaborator.sTree which are all indirect

diff --git a/packages/web-app-files/src/components/PublicLinksSidebar/PrivateLinkItem.vue b/packages/web-app-files/src/components/PublicLinksSidebar/PrivateLinkItem.vue
@@ -37,7 +37,7 @@ export default {
   }),
 
   computed: {
-    ...mapGetters('Files', ['highlightedFile'], ['capabilities']),
+    ...mapGetters('Files', ['highlightedFile', 'capabilities']),
 
     copyLabel() {
       return this.$gettext('Copy private link url')

diff --git a/packages/web-runtime/src/components/Avatar.vue b/packages/web-runtime/src/components/Avatar.vue
@@ -1,9 +1,8 @@
 <template>
-  <component :is="type" v-if="enabled">
+  <component :is="type" v-if="enabled" :aria-hidden="true">
     <oc-spinner
       v-if="loading"
       key="avatar-loading"
-      :aria-label="$gettext('Loading user avatar')"
       :style="`width: ${width}px; height: ${width}px;`"
     />
     <oc-avatar