Merge branch 'release' into stable

language/fr.json

@@ -0,0 +1,37 @@
+{
+  "semantics": [
+    {
+      "label": "Cartes",
+      "entity": "une carte",
+      "field": {
+        "label": "Carte",
+        "fields": [
+          {
+            "label": "Image"
+          },
+          {
+            "label": "Description",
+            "description": "Petit texte affiché quand deux cartes identiques sont trouvées."
+          }
+        ]
+      }
+    },
+    {
+      "label": "Localisation",
+      "fields": [
+        {
+          "label": "Texte pour une carte à retourner",
+          "default": "Retourner"
+        },
+        {
+          "label": "Texte pour le temps passé",
+          "default": "Durée écoulée"
+        },
+        {
+          "label": "Texte de feedback",
+          "default": "Bon travail!"
+        }
+      ]
+    }
+  ]
+}

library.json

@@ -3,7 +3,7 @@
   "description": "See how many cards you can remember!",
   "majorVersion": 1,
   "minorVersion": 1,
-  "patchVersion": 4,
+  "patchVersion": 5,
   "runnable": 1,
   "author": "Amendor AS",
   "license": "MIT",
@@ -30,4 +30,4 @@
       "path": "popup.js"
     }
   ]
-}
+}

memory-game.js

@@ -39,8 +39,9 @@ H5P.MemoryGame = (function (EventDispatcher, $) {
         if (desc !== undefined) {
           // Pause timer and show desciption.
           timer.stop();
-          popup.show(desc, card.getImage(), function () {
+          popup.show(desc, card.getImage(), function () {
             if (finished) {
+              self.triggerXAPIScored(1, 1, 'completed');
               // Game has finished
               $feedback.addClass('h5p-show');
             }
@@ -51,6 +52,7 @@ H5P.MemoryGame = (function (EventDispatcher, $) {
           });
         }
         else if (finished) {
+          self.triggerXAPIScored(1, 1, 'completed');
           // Game has finished
           timer.stop();
           $feedback.addClass('h5p-show');
@@ -72,6 +74,7 @@ H5P.MemoryGame = (function (EventDispatcher, $) {
      */
     var addCard = function (card, mate) {
       card.on('flip', function () {
+        self.triggerXAPI('interacted');
         // Keep track of time spent
         timer.start();
 
@@ -112,6 +115,7 @@ H5P.MemoryGame = (function (EventDispatcher, $) {
      * @param {H5P.jQuery} $container
      */
     self.attach = function ($container) {
+      this.triggerXAPI('attempted');
       // TODO: Only create on first!
       $container.addClass('h5p-memory-game').html('');