From 653d12a85ed3e0ae0edb9953781713878d94dcac Mon Sep 17 00:00:00 2001
From: Thomas Marstrander <thomasmars87@gmail.com>
Date: Mon, 27 Jun 2016 11:43:00 +0200
Subject: [PATCH 01/16] Make readspeakers announce current question of total
 when changing question. HFJ-2041

---
 css/questionset.css |  7 +++++++
 js/questionset.js   | 15 ++++++++++++++-
 language/ar.json    |  5 +++++
 language/de.json    |  5 +++++
 language/fr.json    |  5 +++++
 language/it.json    |  5 +++++
 language/nb.json    |  5 +++++
 language/nn.json    |  5 +++++
 semantics.json      |  7 +++++++
 9 files changed, 58 insertions(+), 1 deletion(-)

diff --git a/css/questionset.css b/css/questionset.css
index 5e9cd9b..1786d12 100644
--- a/css/questionset.css
+++ b/css/questionset.css
@@ -125,6 +125,13 @@
   transition: none;
 }
 
+.qs-progress-announcer {
+  height: 0;
+  width: 0;
+  position: absolute;
+  overflow: hidden;
+}
+
 .h5p-question .h5p-question-prev,
 .h5p-question .h5p-question-finish,
 .h5p-question .h5p-question-next {
diff --git a/js/questionset.js b/js/questionset.js
index 788b447..9d87537 100644
--- a/js/questionset.js
+++ b/js/questionset.js
@@ -31,6 +31,7 @@ H5P.QuestionSet = function (options, contentId) {
           '  <div class="buttons"><a class="qs-startbutton h5p-joubelui-button h5p-button"><%= introPage.startButtonText %></a></div>' +
           '</div>' +
           '<% } %>' +
+          '<div tabindex="-1" class="qs-progress-announcer"></div>' +
           '<div class="questionset<% if (introPage.showIntroPage) { %> hidden<% } %>">' +
           '  <% for (var i=0; i<questions.length; i++) { %>' +
           '    <div class="question-container"></div>' +
@@ -88,7 +89,8 @@ H5P.QuestionSet = function (options, contentId) {
       finishButton: 'Finish',
       textualProgress: 'Question: @current of @total questions',
       jumpToQuestion: 'Jump to question %d',
-      questionLabel: 'Question'
+      questionLabel: 'Question',
+      readSpeakerProgress: 'Question @current of @total'
     },
     endGame: {
       showResultPage: true,
@@ -224,6 +226,17 @@ H5P.QuestionSet = function (options, contentId) {
       $('.progress-dot:eq(' + questionNumber +')', $myDom).addClass('current');
     }
 
+    // Announce question number of total, must use timeout because of buttons logic
+    setTimeout(function () {
+      var humanizedProgress = params.texts.readSpeakerProgress
+        .replace('@current', (currentQuestion + 1).toString())
+        .replace('@total', questionInstances.length.toString());
+
+      $('.qs-progress-announcer', $myDom)
+        .html(humanizedProgress)
+        .focus();
+    }, 0);
+
     // Remember where we are
     _updateButtons();
     self.trigger('resize');
diff --git a/language/ar.json b/language/ar.json
index 5217dad..bd1d4e0 100644
--- a/language/ar.json
+++ b/language/ar.json
@@ -83,6 +83,11 @@
         {
           "label": "Copyright dialog question label",
           "default": "Question"
+        },
+        {
+          "label": "Readspeaker progress",
+          "description": "May use @current and @total question variables",
+          "default": "Question @current of @total"
         }
       ]
     },
diff --git a/language/de.json b/language/de.json
index 82a29c6..a89cdba 100644
--- a/language/de.json
+++ b/language/de.json
@@ -88,6 +88,11 @@
         {
           "label": "Copyright dialog question label",
           "default": "Question"
+        },
+        {
+          "label": "Readspeaker progress",
+          "description": "May use @current and @total question variables",
+          "default": "Question @current of @total"
         }
       ]
     },
diff --git a/language/fr.json b/language/fr.json
index 23f6fb9..ed64dc7 100644
--- a/language/fr.json
+++ b/language/fr.json
@@ -83,6 +83,11 @@
         {
           "label": "Copyright dialog question label",
           "default": "Question"
+        },
+        {
+          "label": "Readspeaker progress",
+          "description": "May use @current and @total question variables",
+          "default": "Question @current of @total"
         }
       ]
     },
diff --git a/language/it.json b/language/it.json
index 8af2417..1e43746 100644
--- a/language/it.json
+++ b/language/it.json
@@ -83,6 +83,11 @@
         {
           "label": "Copyright dialog question label",
           "default": "Question"
+        },
+        {
+          "label": "Readspeaker progress",
+          "description": "May use @current and @total question variables",
+          "default": "Question @current of @total"
         }
       ]
     },
diff --git a/language/nb.json b/language/nb.json
index 84783da..4702512 100644
--- a/language/nb.json
+++ b/language/nb.json
@@ -85,6 +85,11 @@
         {
           "label": "Opphavsrett spørsmål-etikett",
           "default": "Spørsmål"
+        },
+        {
+          "label": "Fremdriftstekst for hjelpemiddelteknologi",
+          "description": "Kan bruke @current og @total variabler",
+          "default": "Deloppgave @current av @total"
         }
       ]
     },
diff --git a/language/nn.json b/language/nn.json
index 5e47a98..7f14bd7 100644
--- a/language/nn.json
+++ b/language/nn.json
@@ -85,6 +85,11 @@
         {
           "label": "Opphavsrett spørsmål-etikett",
           "default": "Spørsmål"
+        },
+        {
+          "label": "Fremdriftstekst for hjelpemiddelteknologi",
+          "description": "Kan bruke @current og @total variabler",
+          "default": "Deloppgave @current av @total"
         }
       ]
     },
diff --git a/semantics.json b/semantics.json
index 1ce4c57..b60dbd0 100644
--- a/semantics.json
+++ b/semantics.json
@@ -165,6 +165,13 @@
         "type": "text",
         "label": "Copyright dialog question label",
         "default": "Question"
+      },
+      {
+        "name": "readSpeakerProgress",
+        "type": "text",
+        "label": "Readspeaker progress",
+        "description": "May use @current and @total question variables",
+        "default": "Question @current of @total"
       }
     ]
   },

From 45af3ef06e832dd4f31483462cf0be4b14a5f759 Mon Sep 17 00:00:00 2001
From: Thomas Marstrander <thomasmars87@gmail.com>
Date: Mon, 27 Jun 2016 11:59:36 +0200
Subject: [PATCH 02/16] Make sure to show announcer when changing it, since
 resetTask hides it. HFJ-2041

---
 js/questionset.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/js/questionset.js b/js/questionset.js
index 9d87537..6f3ceb0 100644
--- a/js/questionset.js
+++ b/js/questionset.js
@@ -233,6 +233,7 @@ H5P.QuestionSet = function (options, contentId) {
         .replace('@total', questionInstances.length.toString());
 
       $('.qs-progress-announcer', $myDom)
+        .show()
         .html(humanizedProgress)
         .focus();
     }, 0);

From 7bcd2472bac436ef96f65441cf3604cafa13f209 Mon Sep 17 00:00:00 2001
From: Thomas Marstrander <thomasmars87@gmail.com>
Date: Mon, 27 Jun 2016 15:42:31 +0200
Subject: [PATCH 03/16] Read feedback when changing question. Do not read
 feedback when showing all solutions. HFJ-2043

---
 js/questionset.js | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/js/questionset.js b/js/questionset.js
index 6f3ceb0..079876c 100644
--- a/js/questionset.js
+++ b/js/questionset.js
@@ -236,6 +236,10 @@ H5P.QuestionSet = function (options, contentId) {
         .show()
         .html(humanizedProgress)
         .focus();
+
+      if (instance && instance.readFeedback) {
+        instance.readFeedback();
+      }
     }, 0);
 
     // Remember where we are
@@ -252,7 +256,10 @@ H5P.QuestionSet = function (options, contentId) {
   var showSolutions = function () {
     for (var i = 0; i < questionInstances.length; i++) {
       try {
+        // Do not read answers
+        questionInstances[i].toggleReadSpeaker(true);
         questionInstances[i].showSolutions();
+        questionInstances[i].toggleReadSpeaker(false);
       }
       catch(error) {
         H5P.error("subcontent does not contain a valid showSolutions function");

From 917a8ed3c471b53c060b69c3a967e3928e166a78 Mon Sep 17 00:00:00 2001
From: Thomas Marstrander <thomasmars87@gmail.com>
Date: Tue, 28 Jun 2016 12:29:15 +0200
Subject: [PATCH 04/16] Reset individual questions on retry.

Remove finish button if a question is reset.
Remove dot styling if a question is reset.
HFJ-2044
---
 js/questionset.js | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/js/questionset.js b/js/questionset.js
index 079876c..4b9e440 100644
--- a/js/questionset.js
+++ b/js/questionset.js
@@ -180,9 +180,14 @@ H5P.QuestionSet = function (options, contentId) {
       answered = answered && (questionInstances[i]).getAnswerGiven();
     }
 
-    if (currentQuestion === (params.questions.length - 1) && answered &&
+    if (currentQuestion === (params.questions.length - 1) &&
         questionInstances[currentQuestion]) {
-      questionInstances[currentQuestion].showButton('finish');
+      if (answered) {
+        questionInstances[currentQuestion].showButton('finish');
+      }
+      else {
+        questionInstances[currentQuestion].hideButton('finish');
+      }
     }
  };
 
@@ -222,7 +227,14 @@ H5P.QuestionSet = function (options, contentId) {
     }
     else {
       // Set currentNess
-      $('.progress-dot.current', $myDom).removeClass('current');
+      var $currentQuestion = $('.progress-dot.current', $myDom);
+      var previousQuestion = $currentQuestion.index();
+      $currentQuestion.removeClass('current');
+      if (previousQuestion >= 0 && !questionInstances[previousQuestion].getAnswerGiven()) {
+        $currentQuestion
+          .removeClass('answered')
+          .addClass('unanswered');
+      }
       $('.progress-dot:eq(' + questionNumber +')', $myDom).addClass('current');
     }
 

From bc5668a4a006b64aa55681c0483b5e8a9c1a3001 Mon Sep 17 00:00:00 2001
From: Thomas Marstrander <thomasmars87@gmail.com>
Date: Tue, 28 Jun 2016 15:07:05 +0200
Subject: [PATCH 05/16] Accessible navigation line.

Made readspeakers abel to announce all visible elements of the navigation line, i.e. answered/unanswered, current, and number.
HFJ-2040
---
 js/questionset.js | 71 +++++++++++++++++++++++++++++++++++++----------
 language/ar.json  | 12 ++++++++
 language/de.json  | 12 ++++++++
 language/fr.json  | 12 ++++++++
 language/it.json  | 12 ++++++++
 language/nb.json  | 12 ++++++++
 language/nn.json  | 12 ++++++++
 semantics.json    | 18 ++++++++++++
 8 files changed, 147 insertions(+), 14 deletions(-)

diff --git a/js/questionset.js b/js/questionset.js
index 4b9e440..2670ddc 100644
--- a/js/questionset.js
+++ b/js/questionset.js
@@ -41,7 +41,7 @@ H5P.QuestionSet = function (options, contentId) {
           '      <% if (progressType == "dots") { %>' +
           '        <div class="dots-container">' +
           '          <% for (var i=0; i<questions.length; i++) { %>' +
-          '            <a href="#" class="progress-dot unanswered" aria-label="<%= texts.jumpToQuestion.replace("%d", i + 1) %>"></a>' +
+          '            <a href="#" class="progress-dot unanswered" aria-label="<%= texts.unansweredText + ", " +  texts.jumpToQuestion.replace("%d", i + 1) %>"></a>' +
           '          <%} %>' +
           '        </div>' +
           '      <% } else if (progressType == "textual") { %>' +
@@ -90,7 +90,10 @@ H5P.QuestionSet = function (options, contentId) {
       textualProgress: 'Question: @current of @total questions',
       jumpToQuestion: 'Jump to question %d',
       questionLabel: 'Question',
-      readSpeakerProgress: 'Question @current of @total'
+      readSpeakerProgress: 'Question @current of @total',
+      unansweredText: 'Unanswered',
+      answeredText: 'Answered',
+      currentQuestionText: 'Current question'
     },
     endGame: {
       showResultPage: true,
@@ -227,15 +230,12 @@ H5P.QuestionSet = function (options, contentId) {
     }
     else {
       // Set currentNess
-      var $currentQuestion = $('.progress-dot.current', $myDom);
-      var previousQuestion = $currentQuestion.index();
-      $currentQuestion.removeClass('current');
-      if (previousQuestion >= 0 && !questionInstances[previousQuestion].getAnswerGiven()) {
-        $currentQuestion
-          .removeClass('answered')
-          .addClass('unanswered');
+      var previousQuestion = $('.progress-dot.current', $myDom).index();
+      if (previousQuestion >= 0) {
+        toggleCurrentDot(previousQuestion, false);
+        toggleAnsweredDot(previousQuestion, questionInstances[previousQuestion].getAnswerGiven());
       }
-      $('.progress-dot:eq(' + questionNumber +')', $myDom).addClass('current');
+      toggleCurrentDot(questionNumber, true);
     }
 
     // Announce question number of total, must use timeout because of buttons logic
@@ -300,7 +300,9 @@ H5P.QuestionSet = function (options, contentId) {
     questionInstances[questionInstances.length - 1].hideButton('finish');
 
     // Mark all tasks as unanswered:
-    $('.progress-dot').removeClass('answered').addClass('unanswered');
+    $('.progress-dot').each(function (idx) {
+      toggleAnsweredDot(idx, false);
+    });
 
     //Force the last page to be reRendered
     rendered = false;
@@ -323,6 +325,48 @@ H5P.QuestionSet = function (options, contentId) {
     }
   };
 
+  /**
+   * Toggle answered state of dot at given index
+   * @param {number} dotIndex Index of dot
+   * @param {boolean} isAnswered True if is answered, False if not answered
+   */
+  var toggleAnsweredDot = function(dotIndex, isAnswered) {
+    var $el = $('.progress-dot:eq(' + dotIndex +')', $myDom);
+
+    // Skip current button
+    if ($el.hasClass('current')) {
+      return;
+    }
+
+    var label = (isAnswered ? params.texts.answeredText : params.texts.unansweredText) +
+      ', ' +
+      params.texts.jumpToQuestion.replace('%d', (dotIndex + 1).toString());
+
+    $el.toggleClass('unanswered', !isAnswered)
+      .toggleClass('answered', isAnswered)
+      .attr('aria-label', label);
+  };
+
+  /**
+   * Toggle current state of dot at given index
+   * @param dotIndex
+   * @param isCurrent
+   */
+  var toggleCurrentDot = function (dotIndex, isCurrent) {
+    var $el = $('.progress-dot:eq(' + dotIndex +')', $myDom);
+    var texts = params.texts;
+    var label = texts.currentQuestionText + ', ';
+
+    if (!isCurrent) {
+      var isAnswered = $el.hasClass('answered');
+      label = (isAnswered ? texts.answeredText : texts.unansweredText) + ', ';
+    }
+
+    label += texts.jumpToQuestion.replace('%d', (dotIndex + 1).toString());
+    $el.toggleClass('current', isCurrent)
+      .attr('aria-label', label);
+  };
+
   var _displayEndGame = function () {
     if (rendered) {
       $myDom.children().hide().filter('.questionset-results').show();
@@ -536,9 +580,8 @@ H5P.QuestionSet = function (options, contentId) {
         if (shortVerb === 'interacted' ||
             shortVerb === 'answered' ||
             shortVerb === 'attempted') {
-          if (questionInstances[currentQuestion].getAnswerGiven()) {
-            $('.progress-dot:eq(' + currentQuestion +')', $myDom).removeClass('unanswered').addClass('answered');
-          }
+          toggleAnsweredDot(currentQuestion,
+            questionInstances[currentQuestion].getAnswerGiven());
           _updateButtons();
         }
         if (shortVerb === 'completed') {
diff --git a/language/ar.json b/language/ar.json
index bd1d4e0..c8f4942 100644
--- a/language/ar.json
+++ b/language/ar.json
@@ -88,6 +88,18 @@
           "label": "Readspeaker progress",
           "description": "May use @current and @total question variables",
           "default": "Question @current of @total"
+        },
+        {
+          "label": "Unanswered question text",
+          "default": "Unanswered"
+        },
+        {
+          "label": "Answered question text",
+          "default": "Answered"
+        },
+        {
+          "label": "Current question text",
+          "default": "Current question"
         }
       ]
     },
diff --git a/language/de.json b/language/de.json
index a89cdba..eefb75b 100644
--- a/language/de.json
+++ b/language/de.json
@@ -93,6 +93,18 @@
           "label": "Readspeaker progress",
           "description": "May use @current and @total question variables",
           "default": "Question @current of @total"
+        },
+        {
+          "label": "Unanswered question text",
+          "default": "Unanswered"
+        },
+        {
+          "label": "Answered question text",
+          "default": "Answered"
+        },
+        {
+          "label": "Current question text",
+          "default": "Current question"
         }
       ]
     },
diff --git a/language/fr.json b/language/fr.json
index ed64dc7..ad1aea9 100644
--- a/language/fr.json
+++ b/language/fr.json
@@ -88,6 +88,18 @@
           "label": "Readspeaker progress",
           "description": "May use @current and @total question variables",
           "default": "Question @current of @total"
+        },
+        {
+          "label": "Unanswered question text",
+          "default": "Unanswered"
+        },
+        {
+          "label": "Answered question text",
+          "default": "Answered"
+        },
+        {
+          "label": "Current question text",
+          "default": "Current question"
         }
       ]
     },
diff --git a/language/it.json b/language/it.json
index 1e43746..f29ecf6 100644
--- a/language/it.json
+++ b/language/it.json
@@ -88,6 +88,18 @@
           "label": "Readspeaker progress",
           "description": "May use @current and @total question variables",
           "default": "Question @current of @total"
+        },
+        {
+          "label": "Unanswered question text",
+          "default": "Unanswered"
+        },
+        {
+          "label": "Answered question text",
+          "default": "Answered"
+        },
+        {
+          "label": "Current question text",
+          "default": "Current question"
         }
       ]
     },
diff --git a/language/nb.json b/language/nb.json
index 4702512..503a1d1 100644
--- a/language/nb.json
+++ b/language/nb.json
@@ -90,6 +90,18 @@
           "label": "Fremdriftstekst for hjelpemiddelteknologi",
           "description": "Kan bruke @current og @total variabler",
           "default": "Deloppgave @current av @total"
+        },
+        {
+          "label": "Ikke svart på spørsmål-tekst",
+          "default": "Ikke svart"
+        },
+        {
+          "label": "Svart på spørsmål-tekst",
+          "default": "Svar avgitt"
+        },
+        {
+          "label": "Aktivt spørsmål-tekst",
+          "default": "Aktivt spørsmål"
         }
       ]
     },
diff --git a/language/nn.json b/language/nn.json
index 7f14bd7..d92e638 100644
--- a/language/nn.json
+++ b/language/nn.json
@@ -90,6 +90,18 @@
           "label": "Fremdriftstekst for hjelpemiddelteknologi",
           "description": "Kan bruke @current og @total variabler",
           "default": "Deloppgave @current av @total"
+        },
+        {
+          "label": "Ikke svart på spørsmål-tekst",
+          "default": "Ikke svart"
+        },
+        {
+          "label": "Svart på spørsmål-tekst",
+          "default": "Svar avgitt"
+        },
+        {
+          "label": "Aktivt spørsmål-tekst",
+          "default": "Aktivt spørsmål"
         }
       ]
     },
diff --git a/semantics.json b/semantics.json
index b60dbd0..45c80b4 100644
--- a/semantics.json
+++ b/semantics.json
@@ -172,6 +172,24 @@
         "label": "Readspeaker progress",
         "description": "May use @current and @total question variables",
         "default": "Question @current of @total"
+      },
+      {
+        "name": "unansweredText",
+        "type": "text",
+        "label": "Unanswered question text",
+        "default": "Unanswered"
+      },
+      {
+        "name": "answeredText",
+        "type": "text",
+        "label": "Answered question text",
+        "default": "Answered"
+      },
+      {
+        "name": "currentQuestionText",
+        "type": "text",
+        "label": "Current question text",
+        "default": "Current question"
       }
     ]
   },

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 06/16] 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",

From 7071366b2d5b3a66080ca037ddaba4bac1210bdf Mon Sep 17 00:00:00 2001
From: Frode Petterson <frode.andre.petterson@gmail.com>
Date: Mon, 4 Jul 2016 11:29:28 +0200
Subject: [PATCH 07/16] Use menu instead of navigation

Use keyboard to navigate menu.
HFJ-2040
---
 js/questionset.js | 63 ++++++++++++++++++++++++++++++++++++++---------
 1 file changed, 51 insertions(+), 12 deletions(-)

diff --git a/js/questionset.js b/js/questionset.js
index 24a017e..eb77771 100644
--- a/js/questionset.js
+++ b/js/questionset.js
@@ -39,14 +39,14 @@ H5P.QuestionSet = function (options, contentId) {
           '  <div class="qs-footer">' +
           '    <div class="qs-progress">' +
           '      <% if (progressType == "dots") { %>' +
-          '        <div class="dots-container" role="navigation">' +
+          '        <ul class="dots-container" role="menu">' +
           '          <% for (var i=0; i<questions.length; i++) { %>' +
-          '            <a href="#" class="progress-dot unanswered" ' +
+          '            <li class="progress-item"><a href="#" class="progress-dot unanswered" ' +
           '                   aria-label="<%=' +
           '                   texts.jumpToQuestion.replace("%d", i + 1).replace("%total", questions.length)' +
           '                   + ", " + texts.unansweredText' +
-          '            %>"></a>' +
-          '          <%} %>' +
+          '            %>" tabindex="-1"></a></li>' +
+          '          <% } %>' +
           '        </div>' +
           '      <% } else if (progressType == "textual") { %>' +
           '        <span class="progress-text"></span>' +
@@ -234,7 +234,7 @@ H5P.QuestionSet = function (options, contentId) {
     }
     else {
       // Set currentNess
-      var previousQuestion = $('.progress-dot.current', $myDom).index();
+      var previousQuestion = $('.progress-dot.current', $myDom).parent().index();
       if (previousQuestion >= 0) {
         toggleCurrentDot(previousQuestion, false);
         toggleAnsweredDot(previousQuestion, questionInstances[previousQuestion].getAnswerGiven());
@@ -367,14 +367,15 @@ H5P.QuestionSet = function (options, contentId) {
 
     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.currentQuestionText;
     }
 
     $el.toggleClass('current', isCurrent)
-      .attr('aria-label', label);
+      .attr('aria-label', label)
+      .attr('tabindex', isCurrent ? 0 : -1);
   };
 
   var _displayEndGame = function () {
@@ -614,13 +615,51 @@ H5P.QuestionSet = function (options, contentId) {
       _showQuestion(params.initialQuestion);
     });
 
-    // Set event listeners.
-    $('.progress-dot', $myDom).click(function () {
+    /**
+     * Triggers changing the current question.
+     *
+     * @private
+     * @param {Object} [event]
+     */
+    var handleProgressDotClick = function (event) {
       _stopQuestion(currentQuestion);
-      _showQuestion($(this).index());
-      return false;
+      _showQuestion($(this).parent().index());
+      event.preventDefault();
+    };
+
+    // Set event listeners.
+    $('.progress-dot', $myDom).click(handleProgressDotClick).keydown(function (event) {
+      var $this = $(this);
+      switch (event.which) {
+        case 13: // Enter
+        case 32: // Space
+          handleProgressDotClick.call(this, event);
+          break;
+
+        case 37: // Left Arrow
+        case 38: // Up Arrow
+          // Go to previous dot
+          var $prev = $this.parent().prev();
+          if ($prev.length) {
+            $prev.children('a').attr('tabindex', '0').focus();
+            $this.attr('tabindex', '-1');
+          }
+          break;
+
+        case 39: // Right Arrow
+        case 40: // Down Arrow
+          // Go to next dot
+          var $next = $this.parent().next();
+          if ($next.length) {
+            $next.children('a').attr('tabindex', '0').focus();
+            $this.attr('tabindex', '-1');
+          }
+          break;
+      }
     });
 
+
+
     // Hide all but initial Question.
     _showQuestion(params.initialQuestion);
 

From 5391fec861df8e0b68dac878ec49fc4ed31111ee Mon Sep 17 00:00:00 2001
From: Frode Petterson <frode.andre.petterson@gmail.com>
Date: Mon, 4 Jul 2016 11:42:56 +0200
Subject: [PATCH 08/16] Turns out navigation was a better fit

HFJ-2040
---
 js/questionset.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/js/questionset.js b/js/questionset.js
index eb77771..dd231c5 100644
--- a/js/questionset.js
+++ b/js/questionset.js
@@ -39,7 +39,7 @@ H5P.QuestionSet = function (options, contentId) {
           '  <div class="qs-footer">' +
           '    <div class="qs-progress">' +
           '      <% if (progressType == "dots") { %>' +
-          '        <ul class="dots-container" role="menu">' +
+          '        <ul class="dots-container" role="navigation">' +
           '          <% for (var i=0; i<questions.length; i++) { %>' +
           '            <li class="progress-item"><a href="#" class="progress-dot unanswered" ' +
           '                   aria-label="<%=' +

From 71f92ff664cb6f7c09abcd0a0093b7605351a375 Mon Sep 17 00:00:00 2001
From: Frode Petterson <frode.andre.petterson@gmail.com>
Date: Mon, 4 Jul 2016 11:54:28 +0200
Subject: [PATCH 09/16] Prevent stealing focus when page loads

HFJ-2040
---
 js/questionset.js | 32 +++++++++++++++++---------------
 1 file changed, 17 insertions(+), 15 deletions(-)

diff --git a/js/questionset.js b/js/questionset.js
index dd231c5..9c2eac7 100644
--- a/js/questionset.js
+++ b/js/questionset.js
@@ -204,7 +204,7 @@ H5P.QuestionSet = function (options, contentId) {
     }
   };
 
-  var _showQuestion = function (questionNumber) {
+  var _showQuestion = function (questionNumber, preventAnnouncement) {
     // Sanitize input.
     if (questionNumber < 0) {
       questionNumber = 0;
@@ -242,21 +242,23 @@ H5P.QuestionSet = function (options, contentId) {
       toggleCurrentDot(questionNumber, true);
     }
 
-    // Announce question number of total, must use timeout because of buttons logic
-    setTimeout(function () {
-      var humanizedProgress = params.texts.readSpeakerProgress
-        .replace('@current', (currentQuestion + 1).toString())
-        .replace('@total', questionInstances.length.toString());
+    if (!preventAnnouncement) {
+      // Announce question number of total, must use timeout because of buttons logic
+      setTimeout(function () {
+        var humanizedProgress = params.texts.readSpeakerProgress
+          .replace('@current', (currentQuestion + 1).toString())
+          .replace('@total', questionInstances.length.toString());
 
-      $('.qs-progress-announcer', $myDom)
-        .show()
-        .html(humanizedProgress)
-        .focus();
+        $('.qs-progress-announcer', $myDom)
+          .show()
+          .html(humanizedProgress)
+          .focus();
 
-      if (instance && instance.readFeedback) {
-        instance.readFeedback();
-      }
-    }, 0);
+        if (instance && instance.readFeedback) {
+          instance.readFeedback();
+        }
+      }, 0);
+    }
 
     // Remember where we are
     _updateButtons();
@@ -661,7 +663,7 @@ H5P.QuestionSet = function (options, contentId) {
 
 
     // Hide all but initial Question.
-    _showQuestion(params.initialQuestion);
+    _showQuestion(params.initialQuestion, true);
 
     if (renderSolutions) {
       showSolutions();

From 020340282166c86004037c55425d45e076cfcc57 Mon Sep 17 00:00:00 2001
From: Frode Petterson <frode.andre.petterson@gmail.com>
Date: Mon, 4 Jul 2016 12:09:11 +0200
Subject: [PATCH 10/16] Fixed positioning of progress dots

HFJ-2040
---
 css/questionset.css | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/css/questionset.css b/css/questionset.css
index 1786d12..90cf581 100644
--- a/css/questionset.css
+++ b/css/questionset.css
@@ -35,6 +35,12 @@
 .dots-container {
   text-align: center;
   line-height: 2em;
+  padding: 0;
+  margin: 0;
+}
+.progress-item {
+  list-style: none;
+  display: inline-block;
 }
 .progress-dot {
   display: inline-block;
@@ -95,6 +101,7 @@
 }
 .qs-footer {
   overflow: hidden;
+  clear: both;
 }
 
 .qs-footer > .prev {

From 587f4882769ead662b0178e7847b680a8a86fb88 Mon Sep 17 00:00:00 2001
From: Frode Petterson <frode.andre.petterson@gmail.com>
Date: Mon, 4 Jul 2016 13:05:38 +0200
Subject: [PATCH 11/16] Bugfix unanswered toggles answered state

HFJ-2040
---
 js/questionset.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/js/questionset.js b/js/questionset.js
index 9c2eac7..f47d002 100644
--- a/js/questionset.js
+++ b/js/questionset.js
@@ -344,6 +344,9 @@ H5P.QuestionSet = function (options, contentId) {
       return;
     }
 
+    // Ensure boolean
+    isAnswered = !!isAnswered;
+
     var label = params.texts.jumpToQuestion
       .replace('%d', (dotIndex + 1).toString())
       .replace('%total', $('.progress-dot', $myDom).length) +

From 5969a8f5149796ed2680b3c625ed969f43a228b2 Mon Sep 17 00:00:00 2001
From: isa-realia <realia@free.fr>
Date: Mon, 4 Jul 2016 15:34:56 +0200
Subject: [PATCH 12/16] Update fr.json

- Added some translations and modiied some others
- Added french translations for the "default" strings
---
 language/fr.json | 126 ++++++++++++++++++++++++++---------------------
 1 file changed, 71 insertions(+), 55 deletions(-)

diff --git a/language/fr.json b/language/fr.json
index 939715a..dfd9b1b 100644
--- a/language/fr.json
+++ b/language/fr.json
@@ -4,7 +4,7 @@
       "label": "Introduction du Quiz ",
       "fields": [
         {
-          "label": "Montrer l'introduction"
+          "label": "Afficher l'introduction"
         },
         {
           "label": "Titre",
@@ -15,7 +15,8 @@
           "description": "Ce texte sera affiché avant le démarrage du quiz."
         },
         {
-          "label": "Texte du bouton de démarrage"
+          "label": "Texte du bouton de démarrage",
+          "default": "Commencer"
         },
         {
           "label": "Image d'arrière-plan",
@@ -29,7 +30,7 @@
     },
     {
       "label": "Indicateur de progression",
-      "description": "Style de l'indicateur de progression de la série de questions",
+      "description": "Style de l'indicateur de progression de la série de questions.",
       "options": [
         {
           "label": "Texte"
@@ -41,7 +42,7 @@
     },
     {
       "label": "Pourcentage de réussite",
-      "description": "Pourcentage exigé pour la réussite du quiz."
+      "description": "Pourcentage exigé pour considérer que le quiz est réussi."
     },
     {
       "label": "Questions",
@@ -60,111 +61,126 @@
       }
     },
     {
-      "label": "Interface des Textes dans le quiz",
+      "label": "Textes de l'interface du quiz",
       "fields": [
         {
-          "label": "Bouton précédent"
+          "label": "Bouton précédent",
+          "default": "Retour"
         },
         {
-          "label": "Bouton suivant"
+          "label": "Bouton suivant",
+          "default": "Suite"
         },
         {
-          "label": "Bouton fin"
+          "label": "Bouton fin",
+          "default": "Terminer"
         },
         {
           "label": "Texte de progression",
-          "description": "Texte utilisé si la progression textuelle est utilisée."
+          "description": "Texte utilisé si la progression textuelle a été sélectionnée.",
+          "default": "Question @current sur @total",
         },
         {
-          "label": "Label for jumping to a certain question",
-          "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": "Texte pour aller directement à une question",
+          "description": "Vous devez utiliser la variable '%d' à la place du numéro de la question et %total à la place du nombre total de questions.",
+          "default": "Question %d sur %total"
         },
         {
-          "label": "Copyright dialog question label",
+          "label": "Texte de la question de la boîte de dialogue de copyright",
           "default": "Question"
         },
         {
-          "label": "Readspeaker progress",
-          "description": "May use @current and @total question variables",
-          "default": "Question @current of @total"
+          "label": "Progression pour la synthèse vocale",
+          "description": "Vous pouvez utiliser les variables @current et @total",
+          "default": "Question @current sur @total"
         },
         {
-          "label": "Unanswered question text",
-          "default": "Unanswered"
+          "label": "Texte d'une question sans réponse",
+          "default": "Pas de réponse donnée"
         },
         {
-          "label": "Answered question text",
-          "default": "Answered"
+          "label": "Texte d'une question ayant reçu une réponse",
+          "default": "Réponse donnée"
         },
         {
-          "label": "Current question text",
-          "default": "Current question"
+          "label": "Texte de la question en cours",
+          "default": "Question en cours"
         }
       ]
     },
     {
-      "label": "Quiz fini",
+      "label": "Quiz terminé",
       "fields": [
         {
-          "label": "Montrer les résultats"
+          "label": "Afficher les résultats"
         },
         {
-          "label": "No results message",
-          "description": "Text displayed on end page when \"Display results\" is disabled",
-          "default": "Finished"
+          "label": "Message si pas de résultats",
+          "description": "Texte affiché sur la page finale si l'option \"Afficher les résultats\" est désactivée.",
+          "default": "Terminé"
         },
         {
-          "label": "Feedback de fin",
-          "description": "Ce texte sera affiché quand l'utilisateur aura totalement terminé le quiz."
+          "label": "Titre des commentaires",
+           "default": "Vos résultats :",
+          "description": "Ce titre sera affiché à la fin du quiz quand l'utilisateur aura répondu à toutes les questions."
         },
         {
           "label": "Texte d'affichage du score",
-          "description": "Texte utilisé pour afficher le score total de l'utilisateur. \"@score\" sera remplacé par le score de l'utilisateur, \"@total\" sera remplacé par le score maximum possible."
+          "description": "Texte utilisé pour afficher le score total de l'utilisateur. \"@score\" sera remplacé par le score de l'utilisateur, \"@total\" sera remplacé par le score maximum possible.",
+           "default": "Vous avez obtenu @score point(s) sur @total",
         },
         {
-          "label": "Texte de félicitation",
-          "description": "Texte affiché lors du passage du quiz avec succès."
+          "label": "Commentaire de félicitation",
+          "placeholder": "Bravo !",
+          "default": "Bravo !",
+          "description": "Ce commentaire sera affiché au-dessus du score de l'utilisateur si celui-ci réussit le quiz."
         },
         {
-          "label": "Commentaire de fin de quiz réussi",
+          "label": "Commentaire en cas de succès",
+           "default": "Vous avez obtenu un très bon score !",
           "description": "Commentaire affiché lors du passage du quiz avec succès."
         },
         {
-          "label": "Texte d'échec",
-          "description": "Texte affiché lors de l'échec au quiz."
+          "label": "Commentaire en cas d'échec",
+           "default": "Vous n'avez pas réussi ce questionnaire.",
+          "description": "Ce commentaire sera affiché au-dessus du score de l'utilisateur si celui-ci échoue au quiz."
         },
         {
-          "label": "Commentaire de fin de quiz échoué",
-          "description": "Commentaire affiché lors de l'échec au quiz."
+          "label": "Commentaire additionnel en cas d'échec",
+          "default": "Refaites un essai !",
+          "description": "Commentaire additionnel affiché lors de l'échec au quiz."
         },
         {
-          "label": "Texte du bouton Solution",
+          "label": "Texte du bouton \"Solution\"",
+           "default": "Voir la solution",
           "description": "Texte pour le bouton de solution."
         },
         {
-          "label": "Texte du bouton Réessayer",
+          "label": "Texte du bouton \"Réessayer\"",
+          "default": "Réessayer",
           "description": "Texte pour le bouton Réessayer."
         },
         {
-          "label": "Texte pour le bouton de fin"
+          "label": "Texte pour le bouton de fin",
+           "default": "Terminer"
         },
         {
-          "label": "Montrer une vidéo avant l'affichage des résultats du quiz"
+          "label": "Afficher une vidéo avant l'affichage des résultats du quiz"
         },
         {
-          "label": "Activer le bouton passer la vidéo"
+          "label": "Activer le bouton \"Passer la vidéo\""
         },
         {
-          "label": "Texte du bouton passer la vidéo"
+          "label": "Texte du bouton \"Passer la vidéo\"",
+           "default": "Passer la vidéo"
         },
         {
-          "label": "Video en cas de succès",
-          "description": "Vidéo affichée lors du passage du quiz avec succès."
+          "label": "Vidéo en cas de succès",
+          "description": "Vidéo affichée si l'utilisateur réussit le quiz."
         },
         {
-          "label": "Video en cas d'échec",
-          "description": "Vidéo affichée lors de l'échec au quiz."
+          "label": "Vidéo en cas d'échec",
+          "description": "Vidéo affichée si l'utilisateur échoue au quiz."
         }
       ]
     },
@@ -172,26 +188,26 @@
       "label": "Options pour les boutons \"Montrer la solution\" et \"Réessayer\".",
       "fields": [
         {
-          "label": "Override \"Show Solution\" button",
-          "description": "This option determines if the \"Show Solution\" button will be shown for all questions, disabled for all or configured for each question individually.",
+          "label": "Ecraser le bouton \"Voir la solution\"",
+          "description": "Cette option détermine si le bouton \"Voir la réponse\" sera affiché pour toutes les questions, désactivé pour toutes ou configuré pour chaque question individuellement.",
           "options": [
             {
-              "label": "Enabled"
+              "label": "Activé"
             },
             {
-              "label": "Disabled"
+              "label": "Désactivé"
             }
           ]
         },
         {
-          "label": "Override \"Retry\" button",
-          "description": "This option determines if the \"Retry\" button will be shown for all questions, disabled for all or configured for each question individually.",
+          "label": "Ecraser le bouton \"Réessayer\"",
+          "description": "Cette option détermine si le bouton \"Réessayer\" sera affiché pour toutes les questions, désactivé pour toutes ou configuré pour chaque question individuellement.",
           "options": [
             {
-              "label": "Enabled"
+              "label": "Activé"
             },
             {
-              "label": "Disabled"
+              "label": "Désactivé"
             }
           ]
         }

From 467e80e39a97935e2df4f4775bb28c8fce5d1387 Mon Sep 17 00:00:00 2001
From: isa-realia <realia@free.fr>
Date: Mon, 4 Jul 2016 16:24:49 +0200
Subject: [PATCH 13/16] Update some strings
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- replace "réessayer" with "recommencer" which is better
---
 language/fr.json | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/language/fr.json b/language/fr.json
index dfd9b1b..fc06c24 100644
--- a/language/fr.json
+++ b/language/fr.json
@@ -156,9 +156,9 @@
           "description": "Texte pour le bouton de solution."
         },
         {
-          "label": "Texte du bouton \"Réessayer\"",
-          "default": "Réessayer",
-          "description": "Texte pour le bouton Réessayer."
+          "label": "Texte du bouton \"Recommencer\"",
+          "default": "Recommencer",
+          "description": "Texte pour le bouton Recommencer."
         },
         {
           "label": "Texte pour le bouton de fin",
@@ -185,11 +185,11 @@
       ]
     },
     {
-      "label": "Options pour les boutons \"Montrer la solution\" et \"Réessayer\".",
+      "label": "Options pour les boutons \"Montrer la solution\" et \"Recommencer\".",
       "fields": [
         {
           "label": "Ecraser le bouton \"Voir la solution\"",
-          "description": "Cette option détermine si le bouton \"Voir la réponse\" sera affiché pour toutes les questions, désactivé pour toutes ou configuré pour chaque question individuellement.",
+          "description": "Cette option détermine si le bouton \"Voir la solution\" sera affiché pour toutes les questions, désactivé pour toutes ou configuré pour chaque question individuellement.",
           "options": [
             {
               "label": "Activé"
@@ -200,8 +200,8 @@
           ]
         },
         {
-          "label": "Ecraser le bouton \"Réessayer\"",
-          "description": "Cette option détermine si le bouton \"Réessayer\" sera affiché pour toutes les questions, désactivé pour toutes ou configuré pour chaque question individuellement.",
+          "label": "Ecraser le bouton \"Recommencer\"",
+          "description": "Cette option détermine si le bouton \"Recommencer\" sera affiché pour toutes les questions, désactivé pour toutes ou configuré pour chaque question individuellement.",
           "options": [
             {
               "label": "Activé"

From da540afb82604a8a42e79c4ec2e2821e052683f4 Mon Sep 17 00:00:00 2001
From: Frode Petterson <frode.andre.petterson@gmail.com>
Date: Tue, 5 Jul 2016 09:50:41 +0200
Subject: [PATCH 14/16] Announce results when finsihed

HFJ-2042
---
 js/questionset.js | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/js/questionset.js b/js/questionset.js
index f47d002..fac4bf5 100644
--- a/js/questionset.js
+++ b/js/questionset.js
@@ -250,9 +250,8 @@ H5P.QuestionSet = function (options, contentId) {
           .replace('@total', questionInstances.length.toString());
 
         $('.qs-progress-announcer', $myDom)
-          .show()
           .html(humanizedProgress)
-          .focus();
+          .show().focus();
 
         if (instance && instance.readFeedback) {
           instance.readFeedback();
@@ -467,6 +466,16 @@ H5P.QuestionSet = function (options, contentId) {
         scoreBar.appendTo($('.feedback-scorebar', $myDom));
         scoreBar.setScore(finals);
         $('.feedback-text', $myDom).html(scoreString);
+
+        // Announce that the question set is complete
+        setTimeout(function () {
+          $('.qs-progress-announcer', $myDom)
+            .html(eparams.message + '.' +
+                  scoreString + '.' +
+                  eparams.comment + '.' +
+                  eparams.resulttext)
+            .show().focus();
+        }, 0);
       }
       else {
         // Remove buttons and feedback section

From 9c981e94c695fd5af900e7dee83d43b0e6c07ba0 Mon Sep 17 00:00:00 2001
From: Frode Petterson <frode.andre.petterson@gmail.com>
Date: Tue, 5 Jul 2016 13:05:42 +0200
Subject: [PATCH 15/16] Syntax fixes for French

---
 language/fr.json | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/language/fr.json b/language/fr.json
index fc06c24..e11b512 100644
--- a/language/fr.json
+++ b/language/fr.json
@@ -78,7 +78,7 @@
         {
           "label": "Texte de progression",
           "description": "Texte utilisé si la progression textuelle a été sélectionnée.",
-          "default": "Question @current sur @total",
+          "default": "Question @current sur @total"
         },
         {
           "label": "Texte pour aller directement à une question",
@@ -121,13 +121,13 @@
         },
         {
           "label": "Titre des commentaires",
-           "default": "Vos résultats :",
+          "default": "Vos résultats :",
           "description": "Ce titre sera affiché à la fin du quiz quand l'utilisateur aura répondu à toutes les questions."
         },
         {
           "label": "Texte d'affichage du score",
           "description": "Texte utilisé pour afficher le score total de l'utilisateur. \"@score\" sera remplacé par le score de l'utilisateur, \"@total\" sera remplacé par le score maximum possible.",
-           "default": "Vous avez obtenu @score point(s) sur @total",
+          "default": "Vous avez obtenu @score point(s) sur @total"
         },
         {
           "label": "Commentaire de félicitation",
@@ -137,12 +137,12 @@
         },
         {
           "label": "Commentaire en cas de succès",
-           "default": "Vous avez obtenu un très bon score !",
+          "default": "Vous avez obtenu un très bon score !",
           "description": "Commentaire affiché lors du passage du quiz avec succès."
         },
         {
           "label": "Commentaire en cas d'échec",
-           "default": "Vous n'avez pas réussi ce questionnaire.",
+          "default": "Vous n'avez pas réussi ce questionnaire.",
           "description": "Ce commentaire sera affiché au-dessus du score de l'utilisateur si celui-ci échoue au quiz."
         },
         {
@@ -152,7 +152,7 @@
         },
         {
           "label": "Texte du bouton \"Solution\"",
-           "default": "Voir la solution",
+          "default": "Voir la solution",
           "description": "Texte pour le bouton de solution."
         },
         {
@@ -162,7 +162,7 @@
         },
         {
           "label": "Texte pour le bouton de fin",
-           "default": "Terminer"
+          "default": "Terminer"
         },
         {
           "label": "Afficher une vidéo avant l'affichage des résultats du quiz"
@@ -172,7 +172,7 @@
         },
         {
           "label": "Texte du bouton \"Passer la vidéo\"",
-           "default": "Passer la vidéo"
+          "default": "Passer la vidéo"
         },
         {
           "label": "Vidéo en cas de succès",

From b7a991fc3ce37a493730cce60542b2d750db0405 Mon Sep 17 00:00:00 2001
From: Frode Petterson <frode.andre.petterson@gmail.com>
Date: Tue, 26 Jul 2016 14:31:29 +0200
Subject: [PATCH 16/16] Remove current blue dot on endGame

HVP-222
---
 js/questionset.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/js/questionset.js b/js/questionset.js
index fac4bf5..912b8b3 100644
--- a/js/questionset.js
+++ b/js/questionset.js
@@ -383,6 +383,7 @@ H5P.QuestionSet = function (options, contentId) {
   };
 
   var _displayEndGame = function () {
+    $('.progress-dot.current', $myDom).removeClass('current');
     if (rendered) {
       $myDom.children().hide().filter('.questionset-results').show();
       self.trigger('resize');