Merge pull request #3039 from owncloud/broken-aria-labels

Fix broken aria labels
owncloud · Feb 14, 2020 · 10e5ab2 · 10e5ab2
2 parents a68d318 + b24ab06
commit 10e5ab2
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 7 deletions.
diff --git a/apps/files/src/components/FileOpenActions.vue b/apps/files/src/components/FileOpenActions.vue
@@ -5,7 +5,7 @@
         icon="close"
         class="uk-position-top-right uk-position-absolute uk-margin-top uk-margin-right"
         @click="closeActions"
-        aria-label="$_closeActionsButtonLabel"
+        :aria-label="$gettext('Close file actions menu')"
       />
       <div v-text="$_label" class="uk-margin-small-bottom" />
       <ul class="uk-nav">
@@ -40,10 +40,6 @@ export default {
     $_label () {
       const translated = this.$gettext('Open %{fileName} in')
       return this.$gettextInterpolate(translated, { fileName: this.filename }, true)
-    },
-
-    $_closeActionsButtonLabel () {
-      return this.$gettext('Close file actions menu')
     }
   },
   watch: {

diff --git a/changelog/unreleased/3039 b/changelog/unreleased/3039
@@ -0,0 +1,5 @@
+Bugfix: Fix accessible labels that said $gettext
+
+Fixed three accessible aria labels that were saying "$gettext" instead of their actual translated text.
+
+https://github.com/owncloud/phoenix/pull/3039
diff --git a/src/components/ApplicationsMenu.vue b/src/components/ApplicationsMenu.vue
@@ -1,6 +1,6 @@
 <template>
   <div v-if="!!applicationsList.length">
-    <oc-button id="_appSwitcherButton" icon="apps" variation="primary" class="oc-topbar-menu-burger uk-height-1-1"  aria-label="$gettext('Application Switcher')" ref="menubutton" />
+    <oc-button id="_appSwitcherButton" icon="apps" variation="primary" class="oc-topbar-menu-burger uk-height-1-1" :aria-label="$gettext('Application Switcher')" ref="menubutton" />
     <oc-drop
       dropId="app-switcher-dropdown"
       toggle="#_appSwitcherButton"

diff --git a/src/components/UserMenu.vue b/src/components/UserMenu.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <oc-button id="_userMenuButton" class="oc-topbar-personal uk-height-1-1" variation="primary" aria-label="$gettext('User Menu')" ref="menuButton">
+    <oc-button id="_userMenuButton" class="oc-topbar-personal uk-height-1-1" variation="primary" :aria-label="$gettext('User Menu')" ref="menuButton">
       <oc-grid gutter="small">
         <avatar-image class="oc-topbar-personal-avatar" :width="32" :userid="userId" :userName="userDisplayName"/>
         <div class="oc-topbar-personal-label">{{ userDisplayName }}</div>