Accessibility: use array for LEEDVIBES_FOLDER_TOGGLE folder name vari…

…able
Simounet · May 13, 2019 · 77a8478 · 77a8478
1 parent ef6ad53
commit 77a8478
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/index.html b/index.html
@@ -100,7 +100,7 @@ <h2 class="feed-add-title">{function="_t('ADD_FEED')"}</h2>
                         <div class="folder__item js-folder__item{if="$folderSelected"} selected{/if}">
                             <button
                                 class="folder__button js-toggle-button{if="!$value->getIsopen()"} folder-closed{/if}"
-                                title="{function="_t($value->getIsopen() ? 'LEEDVIBES_FOLDER_TOGGLE_ON' : 'LEEDVIBES_FOLDER_TOGGLE_OFF')"} {$value->getName()}"
+                                title="{function="_t($value->getIsopen() ? 'LEEDVIBES_FOLDER_TOGGLE_ON' : 'LEEDVIBES_FOLDER_TOGGLE_OFF', array($value->getName()))"}"
                                 aria-expanded="{if="$value->getIsopen()"}true{else}false{/if}"
                             >
                                 <img src="images/triangle.svg" alt="" />

diff --git a/js/script.js b/js/script.js
@@ -467,7 +467,7 @@ function toggleFolder (button) {
     button.attr('aria-expanded', newAriaExpanded);
     var buttonTitle = isAriaExpanded ?
         'LEEDVIBES_FOLDER_TOGGLE_OFF' : 'LEEDVIBES_FOLDER_TOGGLE_ON';
-    button.prop('title', _t(buttonTitle) + ' ' + folderNameText);
+    button.prop('title', _t(buttonTitle, [folderNameText]));
 
     feedBloc.slideToggle(200, function () {
         $(this).toggleClass('hidden');

diff --git a/locale/en.json b/locale/en.json
@@ -3,8 +3,8 @@
   "LEEDVIBES_CONNECTION": "Connection",
   "LEEDVIBES_FEED_MARK_AS_READ": "Mark as read all the events from the $1's feed",
   "LEEDVIBES_FOLDER_MARK_AS_READ": "Mark as read all the events from the $1's folder",
-  "LEEDVIBES_FOLDER_TOGGLE_OFF": "Show the feed list of the folder",
-  "LEEDVIBES_FOLDER_TOGGLE_ON": "Hide the feed list of the folder",
+  "LEEDVIBES_FOLDER_TOGGLE_OFF": "Show the feed list of the $1 folder",
+  "LEEDVIBES_FOLDER_TOGGLE_ON": "Hide the feed list of the $1 folder",
   "LEEDVIBES_GET_NEW_EVENTS": "Show new events",
   "LEEDVIBES_GO_TOP": "Go to the top",
   "LEEDVIBES_IN_THE_FUTURE": "In the future",

diff --git a/locale/fr.json b/locale/fr.json
@@ -3,8 +3,8 @@
   "LEEDVIBES_CONNECTION": "Connexion",
   "LEEDVIBES_FEED_MARK_AS_READ": "Marquer comme lus tous les événements du flux $1",
   "LEEDVIBES_FOLDER_MARK_AS_READ": "Marquer comme lus tous les événements du dossier $1",
-  "LEEDVIBES_FOLDER_TOGGLE_OFF": "Montrer la liste des flux du dossier",
-  "LEEDVIBES_FOLDER_TOGGLE_ON": "Masquer la liste des flux du dossier",
+  "LEEDVIBES_FOLDER_TOGGLE_OFF": "Montrer la liste des flux du dossier $1",
+  "LEEDVIBES_FOLDER_TOGGLE_ON": "Masquer la liste des flux du dossier $1",
   "LEEDVIBES_GET_NEW_EVENTS": "Afficher les nouvelles entrées",
   "LEEDVIBES_GO_TOP": "Aller en haut",
   "LEEDVIBES_IN_THE_FUTURE": "Dans le futur",