diff --git a/media/player/videojs/amd/build/loader.min.js b/media/player/videojs/amd/build/loader.min.js
index df21832ca78..613704c9235 100644
--- a/media/player/videojs/amd/build/loader.min.js
+++ b/media/player/videojs/amd/build/loader.min.js
@@ -1,2 +1,2 @@
-define ("media_videojs/loader",["exports","core/config","core/event","jquery","core/ajax","core/localstorage","core/notification"],function(a,b,c,d,e,f,g){"use strict";Object.defineProperty(a,"__esModule",{value:!0});a.setUp=void 0;b=h(b);c=h(c);d=h(d);e=h(e);f=h(f);g=h(g);var o="undefined"!=typeof window?window:"undefined"!=typeof self?self:"undefined"!=typeof global?global:{};function h(a){return a&&a.__esModule?a:{default:a}}function i(a,b){return n(a)||m(a,b)||k(a,b)||j()}function j(){throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}function k(a,b){if(!a)return;if("string"==typeof a)return l(a,b);var c=Object.prototype.toString.call(a).slice(8,-1);if("Object"===c&&a.constructor)c=a.constructor.name;if("Map"===c||"Set"===c)return Array.from(c);if("Arguments"===c||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(c))return l(a,b)}function l(a,b){if(null==b||b>a.length)b=a.length;for(var c=0,d=Array(b);c<b;c++){d[c]=a[c]}return d}function m(a,b){if("undefined"==typeof Symbol||!(Symbol.iterator in Object(a)))return;var c=[],d=!0,e=!1,f=void 0;try{for(var g=a[Symbol.iterator](),h;!(d=(h=g.next()).done);d=!0){c.push(h.value);if(b&&c.length===b)break}}catch(a){e=!0;f=a}finally{try{if(!d&&null!=g["return"])g["return"]()}finally{if(e)throw f}}return c}function n(a){if(Array.isArray(a))return a}var p,q,r=function(a){q=a;p=!0;s(null,(0,d.default)("body"));c.default.getLegacyEvents().done(function(a){(0,d.default)(document).on(a.FILTER_CONTENT_UPDATED,s)})};a.setUp=r;var s=function(a,c){var e=t();c.find(".mediaplugin_videojs").addBack(".mediaplugin_videojs").find("audio, video").each(function(a,c){var f=(0,d.default)(c).attr("id"),h=(0,d.default)(c).data("setup-lazy"),j=["function"==typeof o.define&&o.define.amd?new Promise(function(a,b){o.require(["media_videojs/video-lazy"],a,b)}):"undefined"!=typeof module&&module.exports&&"undefined"!=typeof require||"undefined"!=typeof module&&module.component&&o.require&&"component"===o.require.loader?Promise.resolve(require(("media_videojs/video-lazy"))):Promise.resolve(o["media_videojs/video-lazy"])];if(h.techOrder&&-1!==h.techOrder.indexOf("youtube")){j.push("function"==typeof o.define&&o.define.amd?new Promise(function(a,b){o.require(["media_videojs/Youtube-lazy"],a,b)}):"undefined"!=typeof module&&module.exports&&"undefined"!=typeof require||"undefined"!=typeof module&&module.component&&o.require&&"component"===o.require.loader?Promise.resolve(require(("media_videojs/Youtube-lazy"))):Promise.resolve(o["media_videojs/Youtube-lazy"]))}if(h.techOrder&&-1!==h.techOrder.indexOf("flash")){j.push("function"==typeof o.define&&o.define.amd?new Promise(function(a,b){o.require(["media_videojs/videojs-flash-lazy"],a,b)}):"undefined"!=typeof module&&module.exports&&"undefined"!=typeof require||"undefined"!=typeof module&&module.component&&o.require&&"component"===o.require.loader?Promise.resolve(require(("media_videojs/videojs-flash-lazy"))):Promise.resolve(o["media_videojs/videojs-flash-lazy"]))}Promise.all([e].concat(j)).then(function(a){var c=i(a,2),d=c[0],e=c[1];if(p){e.options.flash.swf="".concat(b.default.wwwroot,"/media/player/videojs/videojs/video-js.swf");e.addLanguage(q,d);p=!1}e(f,h)}).catch(g.default.exception)})},t=function(){var a=JSON.parse(f.default.get("media_videojs")||"{}");if(q in a){return Promise.resolve(a[q])}var b={methodname:"media_videojs_get_language",args:{lang:q}};return e.default.call([b])[0].then(function(b){a[q]=JSON.parse(b);f.default.set("media_videojs",JSON.stringify(a));return a[q]})}});
+define ("media_videojs/loader",["exports","core/config","core/event","jquery","core/ajax","core/localstorage","core/notification"],function(a,b,c,d,e,f,g){"use strict";Object.defineProperty(a,"__esModule",{value:!0});a.setUp=void 0;b=h(b);c=h(c);d=h(d);e=h(e);f=h(f);g=h(g);var o="undefined"!=typeof window?window:"undefined"!=typeof self?self:"undefined"!=typeof global?global:{};function h(a){return a&&a.__esModule?a:{default:a}}function i(a,b){return n(a)||m(a,b)||k(a,b)||j()}function j(){throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}function k(a,b){if(!a)return;if("string"==typeof a)return l(a,b);var c=Object.prototype.toString.call(a).slice(8,-1);if("Object"===c&&a.constructor)c=a.constructor.name;if("Map"===c||"Set"===c)return Array.from(c);if("Arguments"===c||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(c))return l(a,b)}function l(a,b){if(null==b||b>a.length)b=a.length;for(var c=0,d=Array(b);c<b;c++){d[c]=a[c]}return d}function m(a,b){if("undefined"==typeof Symbol||!(Symbol.iterator in Object(a)))return;var c=[],d=!0,e=!1,f=void 0;try{for(var g=a[Symbol.iterator](),h;!(d=(h=g.next()).done);d=!0){c.push(h.value);if(b&&c.length===b)break}}catch(a){e=!0;f=a}finally{try{if(!d&&null!=g["return"])g["return"]()}finally{if(e)throw f}}return c}function n(a){if(Array.isArray(a))return a}var p,q,r,s=function(a){q=a;p=!0;t(null,(0,d.default)("body"));c.default.getLegacyEvents().done(function(a){(0,d.default)(document).on(a.FILTER_CONTENT_UPDATED,t)})};a.setUp=s;var t=function(a,c){var e=u();c.find(".mediaplugin_videojs").addBack(".mediaplugin_videojs").find("audio, video").each(function(a,c){var f=(0,d.default)(c).attr("id"),h=(0,d.default)(c).data("setup-lazy"),j=["function"==typeof o.define&&o.define.amd?new Promise(function(a,b){o.require(["media_videojs/video-lazy"],a,b)}):"undefined"!=typeof module&&module.exports&&"undefined"!=typeof require||"undefined"!=typeof module&&module.component&&o.require&&"component"===o.require.loader?Promise.resolve(require(("media_videojs/video-lazy"))):Promise.resolve(o["media_videojs/video-lazy"])];if(h.techOrder&&-1!==h.techOrder.indexOf("youtube")){j.push("function"==typeof o.define&&o.define.amd?new Promise(function(a,b){o.require(["media_videojs/Youtube-lazy"],a,b)}):"undefined"!=typeof module&&module.exports&&"undefined"!=typeof require||"undefined"!=typeof module&&module.component&&o.require&&"component"===o.require.loader?Promise.resolve(require(("media_videojs/Youtube-lazy"))):Promise.resolve(o["media_videojs/Youtube-lazy"]))}if(h.techOrder&&-1!==h.techOrder.indexOf("flash")){j.push("function"==typeof o.define&&o.define.amd?new Promise(function(a,b){o.require(["media_videojs/videojs-flash-lazy"],a,b)}):"undefined"!=typeof module&&module.exports&&"undefined"!=typeof require||"undefined"!=typeof module&&module.component&&o.require&&"component"===o.require.loader?Promise.resolve(require(("media_videojs/videojs-flash-lazy"))):Promise.resolve(o["media_videojs/videojs-flash-lazy"]))}Promise.all([e].concat(j)).then(function(a){var c=i(a,2),d=c[0],e=c[1];if(p){e.options.flash.swf="".concat(b.default.wwwroot,"/media/player/videojs/videojs/video-js.swf");e.addLanguage(q,d);p=!1}e(f,h)}).catch(g.default.exception)})},u=function(){if(r){return Promise.resolve(r)}var a="media_videojs/".concat(q),b=f.default.get(a);if(b){var d=JSON.parse(b);r=d;return Promise.resolve(r)}var c={methodname:"media_videojs_get_language",args:{lang:q}};return e.default.call([c])[0].then(function(b){f.default.set(a,b);return b}).then(function(a){return JSON.parse(a)}).then(function(a){r=a;return a})}});
 //# sourceMappingURL=loader.min.js.map
diff --git a/media/player/videojs/amd/build/loader.min.js.map b/media/player/videojs/amd/build/loader.min.js.map
index 823691b27c0..5b2c6688d5c 100644
--- a/media/player/videojs/amd/build/loader.min.js.map
+++ b/media/player/videojs/amd/build/loader.min.js.map
@@ -1 +1 @@
-{"version":3,"sources":["../src/loader.js"],"names":["firstLoad","language","setUp","lang","notifyVideoJS","Event","getLegacyEvents","done","events","document","on","FILTER_CONTENT_UPDATED","e","nodes","langStrings","getLanguageJson","find","addBack","each","index","element","id","attr","config","data","modulePromises","techOrder","indexOf","push","Promise","all","then","langJson","videojs","options","flash","swf","Config","wwwroot","addLanguage","catch","Notification","exception","cached","JSON","parse","LocalStorage","get","resolve","request","methodname","args","Ajax","call","result","set","stringify"],"mappings":"wOA0BA,OACA,OACA,OACA,OACA,OACA,O,6nCAKIA,CAAAA,C,CAKAC,C,CAQSC,CAAK,CAAG,SAACC,CAAD,CAAU,CAC3BF,CAAQ,CAAGE,CAAX,CACAH,CAAS,GAAT,CAEAI,CAAa,CAAC,IAAD,CAAO,cAAO,MAAP,CAAP,CAAb,CAEAC,UAAMC,eAAN,GAAwBC,IAAxB,CAA6B,SAACC,CAAD,CAAY,CACrC,cAAOC,QAAP,EAAiBC,EAAjB,CAAoBF,CAAM,CAACG,sBAA3B,CAAmDP,CAAnD,CACH,CAFD,CAGH,C,cAQKA,CAAAA,CAAa,CAAG,SAACQ,CAAD,CAAIC,CAAJ,CAAc,IAE1BC,CAAAA,CAAW,CAAGC,CAAe,EAFH,CAQhCF,CAAK,CAACG,IAAN,yBACKC,OADL,yBAEKD,IAFL,CAEU,cAFV,EAE0BE,IAF1B,CAE+B,SAACC,CAAD,CAAQC,CAAR,CAAoB,IACrCC,CAAAA,CAAE,CAAG,cAAOD,CAAP,EAAgBE,IAAhB,CAAqB,IAArB,CADgC,CAErCC,CAAM,CAAG,cAAOH,CAAP,EAAgBI,IAAhB,CAAqB,YAArB,CAF4B,CAGrCC,CAAc,CAAG,6SAAQ,0BAAR,mDAHoB,CAK3C,GAAIF,CAAM,CAACG,SAAP,EAA4D,CAAC,CAAzC,GAAAH,CAAM,CAACG,SAAP,CAAiBC,OAAjB,CAAyB,SAAzB,CAAxB,CAAoE,CAEhEF,CAAc,CAACG,IAAf,+SAA2B,4BAA3B,qDACH,CACD,GAAIL,CAAM,CAACG,SAAP,EAA0D,CAAC,CAAvC,GAAAH,CAAM,CAACG,SAAP,CAAiBC,OAAjB,CAAyB,OAAzB,CAAxB,CAAkE,CAE9DF,CAAc,CAACG,IAAf,qTAA2B,kCAA3B,2DACH,CACDC,OAAO,CAACC,GAAR,EAAahB,CAAb,SAA6BW,CAA7B,GACCM,IADD,CACM,WAAyB,cAAvBC,CAAuB,MAAbC,CAAa,MAC3B,GAAIjC,CAAJ,CAAe,CACXiC,CAAO,CAACC,OAAR,CAAgBC,KAAhB,CAAsBC,GAAtB,WAA+BC,UAAOC,OAAtC,+CACAL,CAAO,CAACM,WAAR,CAAoBtC,CAApB,CAA8B+B,CAA9B,EAEAhC,CAAS,GACZ,CACDiC,CAAO,CAACZ,CAAD,CAAKE,CAAL,CAEV,CAVD,EAWCiB,KAXD,CAWOC,UAAaC,SAXpB,CAYH,CA3BL,CA4BH,C,CAOK3B,CAAe,CAAG,UAAM,CAC1B,GAAM4B,CAAAA,CAAM,CAAGC,IAAI,CAACC,KAAL,CAAWC,UAAaC,GAAb,CAAiB,eAAjB,GAAqC,IAAhD,CAAf,CACA,GAAI9C,CAAQ,GAAI0C,CAAAA,CAAhB,CAAwB,CACpB,MAAOd,CAAAA,OAAO,CAACmB,OAAR,CAAgBL,CAAM,CAAC1C,CAAD,CAAtB,CACV,CAED,GAAMgD,CAAAA,CAAO,CAAG,CACZC,UAAU,CAAE,4BADA,CAEZC,IAAI,CAAE,CACFhD,IAAI,CAAEF,CADJ,CAFM,CAAhB,CAMA,MAAOmD,WAAKC,IAAL,CAAU,CAACJ,CAAD,CAAV,EAAqB,CAArB,EAAwBlB,IAAxB,CAA6B,SAAAuB,CAAM,CAAI,CAC1CX,CAAM,CAAC1C,CAAD,CAAN,CAAmB2C,IAAI,CAACC,KAAL,CAAWS,CAAX,CAAnB,CACAR,UAAaS,GAAb,CAAiB,eAAjB,CAAkCX,IAAI,CAACY,SAAL,CAAeb,CAAf,CAAlC,EAEA,MAAOA,CAAAA,CAAM,CAAC1C,CAAD,CAChB,CALM,CAMV,C","sourcesContent":["// This file is part of Moodle - http://moodle.org/\n//\n// Moodle is free software: you can redistribute it and/or modify\n// it under the terms of the GNU General Public License as published by\n// the Free Software Foundation, either version 3 of the License, or\n// (at your option) any later version.\n//\n// Moodle is distributed in the hope that it will be useful,\n// but WITHOUT ANY WARRANTY; without even the implied warranty of\n// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n// GNU General Public License for more details.\n//\n// You should have received a copy of the GNU General Public License\n// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.\n\n/**\n * Video JS loader.\n *\n * This takes care of applying the filter on content which was dynamically loaded.\n *\n * @module     media_videojs/loader\n * @package    media_videojs\n * @copyright  2016 Frédéric Massart - FMCorz.net\n * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later\n */\n\nimport Config from 'core/config';\nimport Event from 'core/event';\nimport jQuery from 'jquery';\nimport Ajax from 'core/ajax';\nimport LocalStorage from 'core/localstorage';\nimport Notification from 'core/notification';\n\n/**\n * Whether this is the first load of videojs module.\n */\nlet firstLoad;\n\n/**\n * The language that is used in the player\n */\nlet language;\n\n/**\n * Set-up.\n *\n * Adds the listener for the event to then notify video.js.\n * @param {string} lang Language to be used in the player\n */\nexport const setUp = (lang) => {\n    language = lang;\n    firstLoad = true;\n    // Notify Video.js about the nodes already present on the page.\n    notifyVideoJS(null, jQuery('body'));\n    // We need to call popover automatically if nodes are added to the page later.\n    Event.getLegacyEvents().done((events) => {\n        jQuery(document).on(events.FILTER_CONTENT_UPDATED, notifyVideoJS);\n    });\n};\n\n/**\n * Notify video.js of new nodes.\n *\n * @param {Event} e The event.\n * @param {NodeList} nodes List of new nodes.\n */\nconst notifyVideoJS = (e, nodes) => {\n    const selector = '.mediaplugin_videojs';\n    const langStrings = getLanguageJson();\n\n    // Find the descendants matching the expected parent of the audio and video\n    // tags. Then also addBack the nodes matching the same selector. Finally,\n    // we find the audio and video tags contained in those parents. Kind thanks\n    // to jQuery for the simplicity.\n    nodes.find(selector)\n        .addBack(selector)\n        .find('audio, video').each((index, element) => {\n            const id = jQuery(element).attr('id');\n            const config = jQuery(element).data('setup-lazy');\n            const modulePromises = [import('media_videojs/video-lazy')];\n\n            if (config.techOrder && config.techOrder.indexOf('youtube') !== -1) {\n                // Add YouTube to the list of modules we require.\n                modulePromises.push(import('media_videojs/Youtube-lazy'));\n            }\n            if (config.techOrder && config.techOrder.indexOf('flash') !== -1) {\n                // Add Flash to the list of modules we require.\n                modulePromises.push(import('media_videojs/videojs-flash-lazy'));\n            }\n            Promise.all([langStrings, ...modulePromises])\n            .then(([langJson, videojs]) => {\n                if (firstLoad) {\n                    videojs.options.flash.swf = `${Config.wwwroot}/media/player/videojs/videojs/video-js.swf`;\n                    videojs.addLanguage(language, langJson);\n\n                    firstLoad = false;\n                }\n                videojs(id, config);\n                return;\n            })\n            .catch(Notification.exception);\n        });\n};\n\n/**\n * Returns the json object of the language strings to be used in the player.\n *\n * @returns {Promise}\n */\nconst getLanguageJson = () => {\n    const cached = JSON.parse(LocalStorage.get('media_videojs') || '{}');\n    if (language in cached) {\n        return Promise.resolve(cached[language]);\n    }\n\n    const request = {\n        methodname: 'media_videojs_get_language',\n        args: {\n            lang: language\n        },\n    };\n    return Ajax.call([request])[0].then(result => {\n        cached[language] = JSON.parse(result);\n        LocalStorage.set('media_videojs', JSON.stringify(cached));\n\n        return cached[language];\n    });\n};\n"],"file":"loader.min.js"}
\ No newline at end of file
+{"version":3,"sources":["../src/loader.js"],"names":["firstLoad","language","langStringCache","setUp","lang","notifyVideoJS","Event","getLegacyEvents","done","events","document","on","FILTER_CONTENT_UPDATED","e","nodes","langStrings","getLanguageJson","find","addBack","each","index","element","id","attr","config","data","modulePromises","techOrder","indexOf","push","Promise","all","then","langJson","videojs","options","flash","swf","Config","wwwroot","addLanguage","catch","Notification","exception","resolve","cacheKey","rawCacheContent","LocalStorage","get","cacheContent","JSON","parse","request","methodname","args","Ajax","call","langStringData","set","result"],"mappings":"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","sourcesContent":["// This file is part of Moodle - http://moodle.org/\n//\n// Moodle is free software: you can redistribute it and/or modify\n// it under the terms of the GNU General Public License as published by\n// the Free Software Foundation, either version 3 of the License, or\n// (at your option) any later version.\n//\n// Moodle is distributed in the hope that it will be useful,\n// but WITHOUT ANY WARRANTY; without even the implied warranty of\n// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n// GNU General Public License for more details.\n//\n// You should have received a copy of the GNU General Public License\n// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.\n\n/**\n * Video JS loader.\n *\n * This takes care of applying the filter on content which was dynamically loaded.\n *\n * @module     media_videojs/loader\n * @package    media_videojs\n * @copyright  2016 Frédéric Massart - FMCorz.net\n * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later\n */\n\nimport Config from 'core/config';\nimport Event from 'core/event';\nimport jQuery from 'jquery';\nimport Ajax from 'core/ajax';\nimport LocalStorage from 'core/localstorage';\nimport Notification from 'core/notification';\n\n/** @var {bool} Whether this is the first load of videojs module */\nlet firstLoad;\n\n/** @var {string} The language that is used in the player */\nlet language;\n\n/** @var {object} List of languages and translations for the current page */\nlet langStringCache;\n\n/**\n * Set-up.\n *\n * Adds the listener for the event to then notify video.js.\n * @param {string} lang Language to be used in the player\n */\nexport const setUp = (lang) => {\n    language = lang;\n    firstLoad = true;\n    // Notify Video.js about the nodes already present on the page.\n    notifyVideoJS(null, jQuery('body'));\n    // We need to call popover automatically if nodes are added to the page later.\n    Event.getLegacyEvents().done((events) => {\n        jQuery(document).on(events.FILTER_CONTENT_UPDATED, notifyVideoJS);\n    });\n};\n\n/**\n * Notify video.js of new nodes.\n *\n * @param {Event} e The event.\n * @param {NodeList} nodes List of new nodes.\n */\nconst notifyVideoJS = (e, nodes) => {\n    const selector = '.mediaplugin_videojs';\n    const langStrings = getLanguageJson();\n\n    // Find the descendants matching the expected parent of the audio and video\n    // tags. Then also addBack the nodes matching the same selector. Finally,\n    // we find the audio and video tags contained in those parents. Kind thanks\n    // to jQuery for the simplicity.\n    nodes.find(selector)\n        .addBack(selector)\n        .find('audio, video').each((index, element) => {\n            const id = jQuery(element).attr('id');\n            const config = jQuery(element).data('setup-lazy');\n            const modulePromises = [import('media_videojs/video-lazy')];\n\n            if (config.techOrder && config.techOrder.indexOf('youtube') !== -1) {\n                // Add YouTube to the list of modules we require.\n                modulePromises.push(import('media_videojs/Youtube-lazy'));\n            }\n            if (config.techOrder && config.techOrder.indexOf('flash') !== -1) {\n                // Add Flash to the list of modules we require.\n                modulePromises.push(import('media_videojs/videojs-flash-lazy'));\n            }\n            Promise.all([langStrings, ...modulePromises])\n            .then(([langJson, videojs]) => {\n                if (firstLoad) {\n                    videojs.options.flash.swf = `${Config.wwwroot}/media/player/videojs/videojs/video-js.swf`;\n                    videojs.addLanguage(language, langJson);\n\n                    firstLoad = false;\n                }\n                videojs(id, config);\n                return;\n            })\n            .catch(Notification.exception);\n        });\n};\n\n/**\n * Returns the json object of the language strings to be used in the player.\n *\n * @returns {Promise}\n */\nconst getLanguageJson = () => {\n    if (langStringCache) {\n        return Promise.resolve(langStringCache);\n    }\n\n    const cacheKey = `media_videojs/${language}`;\n\n    const rawCacheContent = LocalStorage.get(cacheKey);\n    if (rawCacheContent) {\n        const cacheContent = JSON.parse(rawCacheContent);\n\n        langStringCache = cacheContent;\n\n        return Promise.resolve(langStringCache);\n    }\n\n    const request = {\n        methodname: 'media_videojs_get_language',\n        args: {\n            lang: language,\n        },\n    };\n\n    return Ajax.call([request])[0]\n        .then(langStringData => {\n            LocalStorage.set(cacheKey, langStringData);\n\n            return langStringData;\n        })\n        .then(result => JSON.parse(result))\n        .then(langStrings => {\n            langStringCache = langStrings;\n\n            return langStrings;\n        });\n};\n"],"file":"loader.min.js"}
\ No newline at end of file
diff --git a/media/player/videojs/amd/src/loader.js b/media/player/videojs/amd/src/loader.js
index a8c6f55e442..17357b2987d 100644
--- a/media/player/videojs/amd/src/loader.js
+++ b/media/player/videojs/amd/src/loader.js
@@ -31,16 +31,15 @@ import Ajax from 'core/ajax';
 import LocalStorage from 'core/localstorage';
 import Notification from 'core/notification';
 
-/**
- * Whether this is the first load of videojs module.
- */
+/** @var {bool} Whether this is the first load of videojs module */
 let firstLoad;
 
-/**
- * The language that is used in the player
- */
+/** @var {string} The language that is used in the player */
 let language;
 
+/** @var {object} List of languages and translations for the current page */
+let langStringCache;
+
 /**
  * Set-up.
  *
@@ -108,21 +107,38 @@ const notifyVideoJS = (e, nodes) => {
  * @returns {Promise}
  */
 const getLanguageJson = () => {
-    const cached = JSON.parse(LocalStorage.get('media_videojs') || '{}');
-    if (language in cached) {
-        return Promise.resolve(cached[language]);
+    if (langStringCache) {
+        return Promise.resolve(langStringCache);
+    }
+
+    const cacheKey = `media_videojs/${language}`;
+
+    const rawCacheContent = LocalStorage.get(cacheKey);
+    if (rawCacheContent) {
+        const cacheContent = JSON.parse(rawCacheContent);
+
+        langStringCache = cacheContent;
+
+        return Promise.resolve(langStringCache);
     }
 
     const request = {
         methodname: 'media_videojs_get_language',
         args: {
-            lang: language
+            lang: language,
         },
     };
-    return Ajax.call([request])[0].then(result => {
-        cached[language] = JSON.parse(result);
-        LocalStorage.set('media_videojs', JSON.stringify(cached));
 
-        return cached[language];
-    });
+    return Ajax.call([request])[0]
+        .then(langStringData => {
+            LocalStorage.set(cacheKey, langStringData);
+
+            return langStringData;
+        })
+        .then(result => JSON.parse(result))
+        .then(langStrings => {
+            langStringCache = langStrings;
+
+            return langStrings;
+        });
 };