From 6c82013c840d02bcc21f43ace8a62fa037ab4367 Mon Sep 17 00:00:00 2001
From: Thomas Marstrander <thomasmars87@gmail.com>
Date: Thu, 30 Jun 2016 09:47:24 +0200
Subject: [PATCH] Improved how navigation dots are read. HFJ-2040

---
 js/questionset.js | 26 ++++++++++++++++++--------
 language/ar.json  |  4 ++--
 language/de.json  |  4 ++--
 language/fr.json  |  4 ++--
 language/it.json  |  4 ++--
 language/nb.json  |  4 ++--
 language/nn.json  |  4 ++--
 semantics.json    |  4 ++--
 8 files changed, 32 insertions(+), 22 deletions(-)

diff --git a/js/questionset.js b/js/questionset.js
index 2670ddc..24a017e 100644
--- a/js/questionset.js
+++ b/js/questionset.js
@@ -39,9 +39,13 @@ H5P.QuestionSet = function (options, contentId) {
           '  <div class="qs-footer">' +
           '    <div class="qs-progress">' +
           '      <% if (progressType == "dots") { %>' +
-          '        <div class="dots-container">' +
+          '        <div class="dots-container" role="navigation">' +
           '          <% for (var i=0; i<questions.length; i++) { %>' +
-          '            <a href="#" class="progress-dot unanswered" aria-label="<%= texts.unansweredText + ", " +  texts.jumpToQuestion.replace("%d", i + 1) %>"></a>' +
+          '            <a href="#" class="progress-dot unanswered" ' +
+          '                   aria-label="<%=' +
+          '                   texts.jumpToQuestion.replace("%d", i + 1).replace("%total", questions.length)' +
+          '                   + ", " + texts.unansweredText' +
+          '            %>"></a>' +
           '          <%} %>' +
           '        </div>' +
           '      <% } else if (progressType == "textual") { %>' +
@@ -88,7 +92,7 @@ H5P.QuestionSet = function (options, contentId) {
       nextButton: 'Next question',
       finishButton: 'Finish',
       textualProgress: 'Question: @current of @total questions',
-      jumpToQuestion: 'Jump to question %d',
+      jumpToQuestion: 'Question %d of %total',
       questionLabel: 'Question',
       readSpeakerProgress: 'Question @current of @total',
       unansweredText: 'Unanswered',
@@ -338,9 +342,11 @@ H5P.QuestionSet = function (options, contentId) {
       return;
     }
 
-    var label = (isAnswered ? params.texts.answeredText : params.texts.unansweredText) +
+    var label = params.texts.jumpToQuestion
+      .replace('%d', (dotIndex + 1).toString())
+      .replace('%total', $('.progress-dot', $myDom).length) +
       ', ' +
-      params.texts.jumpToQuestion.replace('%d', (dotIndex + 1).toString());
+      (isAnswered ? params.texts.answeredText : params.texts.unansweredText);
 
     $el.toggleClass('unanswered', !isAnswered)
       .toggleClass('answered', isAnswered)
@@ -355,14 +361,18 @@ H5P.QuestionSet = function (options, contentId) {
   var toggleCurrentDot = function (dotIndex, isCurrent) {
     var $el = $('.progress-dot:eq(' + dotIndex +')', $myDom);
     var texts = params.texts;
-    var label = texts.currentQuestionText + ', ';
+    var label = texts.jumpToQuestion
+      .replace('%d', (dotIndex + 1).toString())
+      .replace('%total', $('.progress-dot', $myDom).length);
 
     if (!isCurrent) {
       var isAnswered = $el.hasClass('answered');
-      label = (isAnswered ? texts.answeredText : texts.unansweredText) + ', ';
+      label += (isAnswered ? texts.answeredText : texts.unansweredText) + ', ';
+    }
+    else {
+      label += texts.currentQuestionText + ', ';
     }
 
-    label += texts.jumpToQuestion.replace('%d', (dotIndex + 1).toString());
     $el.toggleClass('current', isCurrent)
       .attr('aria-label', label);
   };
diff --git a/language/ar.json b/language/ar.json
index c8f4942..247754b 100644
--- a/language/ar.json
+++ b/language/ar.json
@@ -77,8 +77,8 @@
         },
         {
           "label": "Label for jumping to a certain question",
-          "description": "You must use the placeholder '%d' instead of the question number.",
-          "default": "Jump to question %d"
+          "description": "You must use the placeholder '%d' instead of the question number, and %total instead of total amount of questions.",
+          "default": "Question %d of %total"
         },
         {
           "label": "Copyright dialog question label",
diff --git a/language/de.json b/language/de.json
index eefb75b..8c828f4 100644
--- a/language/de.json
+++ b/language/de.json
@@ -82,8 +82,8 @@
         },
         {
           "label": "Label for jumping to a certain question",
-          "description": "You must use the placeholder '%d' instead of the question number.",
-          "default": "Jump to question %d"
+          "description": "You must use the placeholder '%d' instead of the question number, and %total instead of total amount of questions.",
+          "default": "Question %d of %total"
         },
         {
           "label": "Copyright dialog question label",
diff --git a/language/fr.json b/language/fr.json
index ad1aea9..939715a 100644
--- a/language/fr.json
+++ b/language/fr.json
@@ -77,8 +77,8 @@
         },
         {
           "label": "Label for jumping to a certain question",
-          "description": "You must use the placeholder '%d' instead of the question number.",
-          "default": "Jump to question %d"
+          "description": "You must use the placeholder '%d' instead of the question number, and %total instead of total amount of questions.",
+          "default": "Question %d of %total"
         },
         {
           "label": "Copyright dialog question label",
diff --git a/language/it.json b/language/it.json
index f29ecf6..3125ef1 100644
--- a/language/it.json
+++ b/language/it.json
@@ -77,8 +77,8 @@
         },
         {
           "label": "Label for jumping to a certain question",
-          "description": "You must use the placeholder '%d' instead of the question number.",
-          "default": "Jump to question %d"
+          "description": "You must use the placeholder '%d' instead of the question number, and %total instead of total amount of questions.",
+          "default": "Question %d of %total"
         },
         {
           "label": "Copyright dialog question label",
diff --git a/language/nb.json b/language/nb.json
index 503a1d1..17b8b6e 100644
--- a/language/nb.json
+++ b/language/nb.json
@@ -79,8 +79,8 @@
         },
         {
           "label": "Merkelapp ved hopping til spørsmål",
-          "description": "Du må bruke plassholderen '%d' istedenfor spørsmålsnummeret.",
-          "default": "Hopp til spørsmål %d"
+          "description": "Du må bruke plassholderen '%d' istedenfor spørsmålsnummeret, og '%total' istedet for totalt antall spørsmål.",
+          "default": "Spørsmål %d av %total"
         },
         {
           "label": "Opphavsrett spørsmål-etikett",
diff --git a/language/nn.json b/language/nn.json
index d92e638..7904bc5 100644
--- a/language/nn.json
+++ b/language/nn.json
@@ -79,8 +79,8 @@
         },
         {
           "label": "Merkelapp ved hopping til spørsmål",
-          "description": "Du må bruke plassholderen '%d' istedenfor spørsmålstalet.",
-          "default": "Hopp til spørsmål %d"
+          "description": "Du må bruke plassholderen '%d' istedenfor spørsmålsnummeret, og '%total' istedet for totalt antall spørsmål.",
+          "default": "Spørsmål %d av %total"
         },
         {
           "label": "Opphavsrett spørsmål-etikett",
diff --git a/semantics.json b/semantics.json
index 45c80b4..a29b346 100644
--- a/semantics.json
+++ b/semantics.json
@@ -157,8 +157,8 @@
         "name": "jumpToQuestion",
         "type": "text",
         "label": "Label for jumping to a certain question",
-        "description": "You must use the placeholder '%d' instead of the question number.",
-        "default": "Jump to question %d"
+        "description": "You must use the placeholder '%d' instead of the question number, and %total instead of total amount of questions.",
+        "default": "Question %d of %total"
       },
       {
         "name": "questionLabel",