diff --git a/lib/amd/build/local/templates/loader.min.js b/lib/amd/build/local/templates/loader.min.js
index 405f09eebf3..07fad8d0272 100644
--- a/lib/amd/build/local/templates/loader.min.js
+++ b/lib/amd/build/local/templates/loader.min.js
@@ -6,6 +6,6 @@ define("core/local/templates/loader",["exports","jquery","core/ajax","core/str",
    * @copyright  2023 Andrew Lyons <andrew@nicols.co.uk>
    * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
    * @since      4.3
-   */Object.defineProperty(_exports,"__esModule",{value:!0}),_exports.default=void 0,_jquery=_interopRequireDefault(_jquery),_ajax=_interopRequireDefault(_ajax),str=_interopRequireWildcard(str),config=_interopRequireWildcard(config),_mustache=_interopRequireDefault(_mustache),_localstorage=_interopRequireDefault(_localstorage);class Loader{constructor(){_defineProperty(this,"currentThemeName","")}static getSearchKey(theme,templateName){return"".concat(theme,"/").concat(templateName)}static getTemplate(templateName){let themeName=arguments.length>1&&void 0!==arguments[1]?arguments[1]:config.theme;const searchKey=this.getSearchKey(themeName,templateName),cachedPromise=this.getTemplatePromiseFromCache(searchKey);if(cachedPromise)return cachedPromise;const existingBufferRecords=this.loadTemplateBuffer.filter((record=>record.searchKey===searchKey));if(existingBufferRecords.length)return existingBufferRecords[0].deferred.promise();const parts=templateName.split("/"),component=(0,_utils.getNormalisedComponent)(parts.shift()),name=parts.join("/"),deferred=_jquery.default.Deferred();return this.loadTemplateBuffer.push({component:component,name:name,theme:themeName,searchKey:searchKey,deferred:deferred}),this.processLoadTemplateBuffer(),deferred.promise()}static setTemplateInCache(searchKey,templateSource){this.templateCache.set(searchKey,templateSource)}static getTemplateFromCache(searchKey){return this.templateCache.get(searchKey)}static hasTemplateInCache(searchKey){return this.templateCache.has(searchKey)}static prefetchTemplates(templateNames,themeName){templateNames.forEach((templateName=>this.prefetchTemplate(templateName,themeName)))}static prefetchTemplate(templateName,themeName){const searchKey=this.getSearchKey(themeName,templateName);if(this.hasTemplateInCache(searchKey))return;if(this.loadTemplateBuffer.filter((record=>record.searchKey===searchKey)).length)return;const parts=templateName.split("/"),component=(0,_utils.getNormalisedComponent)(parts.shift()),name=parts.join("/");this.loadTemplateBuffer.push({component:component,name:name,theme:themeName,searchKey:searchKey,deferred:_jquery.default.Deferred()}),this.processLoadTemplateBuffer()}static partialHelper(name){let themeName=arguments.length>1&&void 0!==arguments[1]?arguments[1]:config.theme;const searchKey=this.getSearchKey(themeName,name);return this.hasTemplateInCache(searchKey)||new Error("Failed to pre-fetch the template: ".concat(name)),this.getTemplateFromCache(searchKey)}static scanForPartials(templateSource){const tokens=_mustache.default.parse(templateSource),partials=[],findPartial=(tokens,partials)=>{let i;for(i=0;i<tokens.length;i++){const token=tokens[i];">"!=token[0]&&"<"!=token[0]||partials.push(token[1]),token.length>4&&findPartial(token[4],partials)}};return findPartial(tokens,partials),partials}static cachePartials(templateName){let themeName=arguments.length>1&&void 0!==arguments[1]?arguments[1]:config.theme,parentage=arguments.length>2&&void 0!==arguments[2]?arguments[2]:[];const searchKey=this.getSearchKey(themeName,templateName);return searchKey in this.cachePartialPromises||(parentage.length||parentage.push(searchKey),this.cachePartialPromises[searchKey]=_jquery.default.Deferred(),this._cachePartials(templateName,themeName,parentage).catch((error=>{this.cachePartialPromises[searchKey].reject(error)}))),this.cachePartialPromises[searchKey]}static async _cachePartials(templateName,themeName,parentage){const searchKey=this.getSearchKey(themeName,templateName),templateSource=await this.getTemplate(templateName,themeName),fetchThemAll=this.scanForPartials(templateSource).filter((partialName=>!(parentage.indexOf("".concat(themeName,"/").concat(partialName))>=0)&&partialName!==templateName)).map((partialName=>(parentage.push("".concat(themeName,"/").concat(partialName)),this.cachePartials(partialName,themeName,parentage))));return await Promise.all(fetchThemAll),this.cachePartialPromises[searchKey].resolve(templateSource)}static processLoadTemplateBuffer(){if(!this.loadTemplateBuffer.length)return;if(this.isLoadingTemplates)return;this.isLoadingTemplates=!0;const templatesToLoad=this.loadTemplateBuffer.slice(),serverRequestsDeferred=_jquery.default.Deferred(),requests=[],templatePromises=templatesToLoad.map((templateData=>{const component=(0,_utils.getNormalisedComponent)(templateData.component),name=templateData.name,searchKey=templateData.searchKey,theme=templateData.theme,templateDeferred=templateData.deferred;let promise=null;if(this.hasTemplateInCache(searchKey))promise=this.getTemplatePromiseFromCache(searchKey);else{requests.push({methodname:"core_output_load_template_with_dependencies",args:{component:component,template:name,themename:theme,lang:(0,_jquery.default)("html").attr("lang").replace(/-/g,"_")}});const index=requests.length-1;promise=serverRequestsDeferred.promise().then((promises=>(templatePromises[searchKey]=promises[index].then((response=>(response.templates.forEach((data=>{data.component=(0,_utils.getNormalisedComponent)(data.component);const tempSearchKey=this.getSearchKey(theme,[data.component,data.name].join("/"));this.setTemplateInCache(tempSearchKey,data.value),config.templaterev>0&&_localstorage.default.set("core_template/".concat(config.templaterev,":").concat(tempSearchKey),data.value)})),response.strings.length&&str.cache_strings(response.strings.map((_ref=>{let{component:component,name:name,value:value}=_ref;return{component:(0,_utils.getNormalisedComponent)(component),key:name,value:value}}))),this.hasTemplateInCache(searchKey)?this.getTemplateFromCache(searchKey):null))),templatePromises[searchKey])))}return promise.then((source=>templateDeferred.resolve(source))).catch((error=>{throw templateDeferred.reject(error),error}))}));requests.length?serverRequestsDeferred.resolve(_ajax.default.call(requests,!0,!1,!1,0,config.templaterev)):serverRequestsDeferred.resolve(),_jquery.default.when.apply(null,templatePromises).then((()=>{this.loadTemplateBuffer.splice(0,templatesToLoad.length),this.isLoadingTemplates=!1,this.processLoadTemplateBuffer()})).catch((()=>{this.loadTemplateBuffer.splice(0,templatesToLoad.length),this.isLoadingTemplates=!1,this.processLoadTemplateBuffer()}))}static getTemplatePromiseFromCache(searchKey){if(searchKey in this.templatePromises)return this.templatePromises[searchKey];if(this.hasTemplateInCache(searchKey)){const templateSource=this.getTemplateFromCache(searchKey);return this.templatePromises[searchKey]=_jquery.default.Deferred().resolve(templateSource).promise(),this.templatePromises[searchKey]}if(config.templaterev<=0)return null;const cached=_localstorage.default.get("core_template/".concat(config.templaterev,":").concat(searchKey));return cached?(this.setTemplateInCache(searchKey,cached),this.templatePromises[searchKey]=_jquery.default.Deferred().resolve(cached).promise(),this.templatePromises[searchKey]):null}}return _exports.default=Loader,_defineProperty(Loader,"loadTemplateBuffer",[]),_defineProperty(Loader,"isLoadingTemplates",!1),_defineProperty(Loader,"templateCache",new Map),_defineProperty(Loader,"templatePromises",{}),_defineProperty(Loader,"cachePartialPromises",[]),_exports.default}));
+   */Object.defineProperty(_exports,"__esModule",{value:!0}),_exports.default=void 0,_jquery=_interopRequireDefault(_jquery),_ajax=_interopRequireDefault(_ajax),str=_interopRequireWildcard(str),config=_interopRequireWildcard(config),_mustache=_interopRequireDefault(_mustache),_localstorage=_interopRequireDefault(_localstorage);class Loader{constructor(){_defineProperty(this,"currentThemeName","")}static getSearchKey(theme,templateName){return"".concat(theme,"/").concat(templateName)}static getTemplate(templateName){let themeName=arguments.length>1&&void 0!==arguments[1]?arguments[1]:config.theme;const searchKey=this.getSearchKey(themeName,templateName),cachedPromise=this.getTemplatePromiseFromCache(searchKey);if(cachedPromise)return cachedPromise;const existingBufferRecords=this.loadTemplateBuffer.filter((record=>record.searchKey===searchKey));if(existingBufferRecords.length)return existingBufferRecords[0].deferred.promise();const parts=templateName.split("/"),component=(0,_utils.getNormalisedComponent)(parts.shift()),name=parts.join("/"),deferred=_jquery.default.Deferred();return this.loadTemplateBuffer.push({component:component,name:name,theme:themeName,searchKey:searchKey,deferred:deferred}),this.processLoadTemplateBuffer(),deferred.promise()}static setTemplateInCache(searchKey,templateSource){this.templateCache.set(searchKey,templateSource)}static getTemplateFromCache(searchKey){return this.templateCache.get(searchKey)}static hasTemplateInCache(searchKey){return this.templateCache.has(searchKey)}static prefetchTemplates(templateNames,themeName){templateNames.forEach((templateName=>this.prefetchTemplate(templateName,themeName)))}static prefetchTemplate(templateName,themeName){const searchKey=this.getSearchKey(themeName,templateName);if(this.hasTemplateInCache(searchKey))return;if(this.loadTemplateBuffer.filter((record=>record.searchKey===searchKey)).length)return;const parts=templateName.split("/"),component=(0,_utils.getNormalisedComponent)(parts.shift()),name=parts.join("/");this.loadTemplateBuffer.push({component:component,name:name,theme:themeName,searchKey:searchKey,deferred:_jquery.default.Deferred()}),this.processLoadTemplateBuffer()}static partialHelper(name){let themeName=arguments.length>1&&void 0!==arguments[1]?arguments[1]:config.theme;const searchKey=this.getSearchKey(themeName,name);return this.hasTemplateInCache(searchKey)||new Error("Failed to pre-fetch the template: ".concat(name)),this.getTemplateFromCache(searchKey)}static scanForPartials(templateSource){const tokens=_mustache.default.parse(templateSource),partials=[],findPartial=(tokens,partials)=>{let i;for(i=0;i<tokens.length;i++){const token=tokens[i];">"!=token[0]&&"<"!=token[0]||partials.push(token[1]),token.length>4&&findPartial(token[4],partials)}};return findPartial(tokens,partials),partials}static cachePartials(templateName){let themeName=arguments.length>1&&void 0!==arguments[1]?arguments[1]:config.theme,parentage=arguments.length>2&&void 0!==arguments[2]?arguments[2]:[];const searchKey=this.getSearchKey(themeName,templateName);return searchKey in this.cachePartialPromises||(parentage.length||parentage.push(searchKey),this.cachePartialPromises[searchKey]=_jquery.default.Deferred(),this._cachePartials(templateName,themeName,parentage).catch((error=>{this.cachePartialPromises[searchKey].reject(error)}))),this.cachePartialPromises[searchKey]}static async _cachePartials(templateName,themeName,parentage){const searchKey=this.getSearchKey(themeName,templateName),templateSource=await this.getTemplate(templateName,themeName),fetchThemAll=this.scanForPartials(templateSource).filter((partialName=>!(parentage.indexOf("".concat(themeName,"/").concat(partialName))>=0)&&partialName!==templateName)).map((partialName=>(parentage.push("".concat(themeName,"/").concat(partialName)),this.cachePartials(partialName,themeName,parentage))));return await Promise.all(fetchThemAll),this.cachePartialPromises[searchKey].resolve(templateSource)}static processLoadTemplateBuffer(){if(!this.loadTemplateBuffer.length)return;if(this.isLoadingTemplates)return;this.isLoadingTemplates=!0;const templatesToLoad=this.loadTemplateBuffer.slice(),serverRequestsDeferred=_jquery.default.Deferred(),requests=[],templatePromises=templatesToLoad.map((templateData=>{const component=(0,_utils.getNormalisedComponent)(templateData.component),name=templateData.name,searchKey=templateData.searchKey,theme=templateData.theme,templateDeferred=templateData.deferred;let promise=null;if(this.hasTemplateInCache(searchKey))promise=this.getTemplatePromiseFromCache(searchKey);else{requests.push({methodname:"core_output_load_template_with_dependencies",args:{component:component,template:name,themename:theme,lang:config.language}});const index=requests.length-1;promise=serverRequestsDeferred.promise().then((promises=>(templatePromises[searchKey]=promises[index].then((response=>(response.templates.forEach((data=>{data.component=(0,_utils.getNormalisedComponent)(data.component);const tempSearchKey=this.getSearchKey(theme,[data.component,data.name].join("/"));this.setTemplateInCache(tempSearchKey,data.value),config.templaterev>0&&_localstorage.default.set("core_template/".concat(config.templaterev,":").concat(tempSearchKey),data.value)})),response.strings.length&&str.cache_strings(response.strings.map((_ref=>{let{component:component,name:name,value:value}=_ref;return{component:(0,_utils.getNormalisedComponent)(component),key:name,value:value}}))),this.hasTemplateInCache(searchKey)?this.getTemplateFromCache(searchKey):null))),templatePromises[searchKey])))}return promise.then((source=>templateDeferred.resolve(source))).catch((error=>{throw templateDeferred.reject(error),error}))}));requests.length?serverRequestsDeferred.resolve(_ajax.default.call(requests,!0,!1,!1,0,config.templaterev)):serverRequestsDeferred.resolve(),_jquery.default.when.apply(null,templatePromises).then((()=>{this.loadTemplateBuffer.splice(0,templatesToLoad.length),this.isLoadingTemplates=!1,this.processLoadTemplateBuffer()})).catch((()=>{this.loadTemplateBuffer.splice(0,templatesToLoad.length),this.isLoadingTemplates=!1,this.processLoadTemplateBuffer()}))}static getTemplatePromiseFromCache(searchKey){if(searchKey in this.templatePromises)return this.templatePromises[searchKey];if(this.hasTemplateInCache(searchKey)){const templateSource=this.getTemplateFromCache(searchKey);return this.templatePromises[searchKey]=_jquery.default.Deferred().resolve(templateSource).promise(),this.templatePromises[searchKey]}if(config.templaterev<=0)return null;const cached=_localstorage.default.get("core_template/".concat(config.templaterev,":").concat(searchKey));return cached?(this.setTemplateInCache(searchKey,cached),this.templatePromises[searchKey]=_jquery.default.Deferred().resolve(cached).promise(),this.templatePromises[searchKey]):null}}return _exports.default=Loader,_defineProperty(Loader,"loadTemplateBuffer",[]),_defineProperty(Loader,"isLoadingTemplates",!1),_defineProperty(Loader,"templateCache",new Map),_defineProperty(Loader,"templatePromises",{}),_defineProperty(Loader,"cachePartialPromises",[]),_exports.default}));
 
 //# sourceMappingURL=loader.min.js.map
\ No newline at end of file
diff --git a/lib/amd/build/local/templates/loader.min.js.map b/lib/amd/build/local/templates/loader.min.js.map
index 5fad93dacad..c9327ad5e74 100644
--- a/lib/amd/build/local/templates/loader.min.js.map
+++ b/lib/amd/build/local/templates/loader.min.js.map
@@ -1 +1 @@
-{"version":3,"file":"loader.min.js","sources":["../../../src/local/templates/loader.js"],"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\nimport $ from 'jquery';\nimport ajax from 'core/ajax';\nimport * as str from 'core/str';\nimport * as config from 'core/config';\nimport mustache from 'core/mustache';\nimport storage from 'core/localstorage';\nimport {getNormalisedComponent} from 'core/utils';\n\n/**\n * Template this.\n *\n * @module     core/local/templates/loader\n * @copyright  2023 Andrew Lyons <andrew@nicols.co.uk>\n * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later\n * @since      4.3\n */\nexport default class Loader {\n    /** @var {String} themeName for the current render */\n    currentThemeName = '';\n\n    /** @var {Object[]} loadTemplateBuffer - List of templates to be loaded */\n    static loadTemplateBuffer = [];\n\n    /** @var {Bool} isLoadingTemplates - Whether templates are currently being loaded */\n    static isLoadingTemplates = false;\n\n    /** @var {Map} templateCache - Cache of already loaded template strings */\n    static templateCache = new Map();\n\n    /** @var {Promise[]} templatePromises - Cache of already loaded template promises */\n    static templatePromises = {};\n\n    /** @var {Promise[]} cachePartialPromises - Cache of already loaded template partial promises */\n    static cachePartialPromises = [];\n\n    /**\n     * A helper to get the search key\n     *\n     * @param {string} theme\n     * @param {string} templateName\n     * @returns {string}\n     */\n    static getSearchKey(theme, templateName) {\n        return `${theme}/${templateName}`;\n    }\n\n    /**\n     * Load a template.\n     *\n     * @method getTemplate\n     * @param {string} templateName - should consist of the component and the name of the template like this:\n     *                              core/menu (lib/templates/menu.mustache) or\n     *                              tool_bananas/yellow (admin/tool/bananas/templates/yellow.mustache)\n     * @param {string} [themeName=config.theme] - The theme to load the template from\n     * @return {Promise} JQuery promise object resolved when the template has been fetched.\n     */\n    static getTemplate(templateName, themeName = config.theme) {\n        const searchKey = this.getSearchKey(themeName, templateName);\n\n        // If we haven't already seen this template then buffer it.\n        const cachedPromise = this.getTemplatePromiseFromCache(searchKey);\n        if (cachedPromise) {\n            return cachedPromise;\n        }\n\n        // Check the buffer to see if this template has already been added.\n        const existingBufferRecords = this.loadTemplateBuffer.filter((record) => record.searchKey === searchKey);\n        if (existingBufferRecords.length) {\n            // This template is already in the buffer so just return the existing\n            // promise. No need to add it to the buffer again.\n            return existingBufferRecords[0].deferred.promise();\n        }\n\n        // This is the first time this has been requested so let's add it to the buffer\n        // to be loaded.\n        const parts = templateName.split('/');\n        const component = getNormalisedComponent(parts.shift());\n        const name = parts.join('/');\n        const deferred = $.Deferred();\n\n        // Add this template to the buffer to be loaded.\n        this.loadTemplateBuffer.push({\n            component,\n            name,\n            theme: themeName,\n            searchKey,\n            deferred,\n        });\n\n        // We know there is at least one thing in the buffer so kick off a processing run.\n        this.processLoadTemplateBuffer();\n        return deferred.promise();\n    }\n\n    /**\n     * Store a template in the cache.\n     *\n     * @param {string} searchKey\n     * @param {string} templateSource\n     */\n    static setTemplateInCache(searchKey, templateSource) {\n        // Cache all of the dependent templates because we'll need them to render\n        // the requested template.\n        this.templateCache.set(searchKey, templateSource);\n    }\n\n    /**\n     * Fetch a template from the cache.\n     *\n     * @param {string} searchKey\n     * @returns {string}\n     */\n    static getTemplateFromCache(searchKey) {\n        return this.templateCache.get(searchKey);\n    }\n\n    /**\n     * Check whether a template is in the cache.\n     *\n     * @param {string} searchKey\n     * @returns {bool}\n     */\n    static hasTemplateInCache(searchKey) {\n        return this.templateCache.has(searchKey);\n    }\n\n    /**\n     * Prefetch a set of templates without rendering them.\n     *\n     * @param {Array} templateNames The list of templates to fetch\n     * @param {string} themeName\n     */\n    static prefetchTemplates(templateNames, themeName) {\n        templateNames.forEach((templateName) => this.prefetchTemplate(templateName, themeName));\n    }\n\n    /**\n     * Prefetech a sginle template without rendering it.\n     *\n     * @param {string} templateName\n     * @param {string} themeName\n     */\n    static prefetchTemplate(templateName, themeName) {\n        const searchKey = this.getSearchKey(themeName, templateName);\n\n        // If we haven't already seen this template then buffer it.\n        if (this.hasTemplateInCache(searchKey)) {\n            return;\n        }\n\n        // Check the buffer to see if this template has already been added.\n        const existingBufferRecords = this.loadTemplateBuffer.filter((record) => record.searchKey === searchKey);\n\n        if (existingBufferRecords.length) {\n            // This template is already in the buffer so just return the existing promise.\n            // No need to add it to the buffer again.\n            return;\n        }\n\n        // This is the first time this has been requested so let's add it to the buffer to be loaded.\n        const parts = templateName.split('/');\n        const component = getNormalisedComponent(parts.shift());\n        const name = parts.join('/');\n\n        // Add this template to the buffer to be loaded.\n        this.loadTemplateBuffer.push({\n            component,\n            name,\n            theme: themeName,\n            searchKey,\n            deferred: $.Deferred(),\n        });\n\n        this.processLoadTemplateBuffer();\n    }\n\n    /**\n     * Load a partial from the cache or ajax.\n     *\n     * @method partialHelper\n     * @param {string} name The partial name to load.\n     * @param {string} [themeName = config.theme] The theme to load the partial from.\n     * @return {string}\n     */\n    static partialHelper(name, themeName = config.theme) {\n        const searchKey = this.getSearchKey(themeName, name);\n\n        if (!this.hasTemplateInCache(searchKey)) {\n            new Error(`Failed to pre-fetch the template: ${name}`);\n        }\n        return this.getTemplateFromCache(searchKey);\n    }\n\n    /**\n     * Scan a template source for partial tags and return a list of the found partials.\n     *\n     * @method scanForPartials\n     * @param {string} templateSource - source template to scan.\n     * @return {Array} List of partials.\n     */\n    static scanForPartials(templateSource) {\n        const tokens = mustache.parse(templateSource);\n        const partials = [];\n\n        const findPartial = (tokens, partials) => {\n            let i;\n            for (i = 0; i < tokens.length; i++) {\n                const token = tokens[i];\n                if (token[0] == '>' || token[0] == '<') {\n                    partials.push(token[1]);\n                }\n                if (token.length > 4) {\n                    findPartial(token[4], partials);\n                }\n            }\n        };\n\n        findPartial(tokens, partials);\n\n        return partials;\n    }\n\n    /**\n     * Load a template and scan it for partials. Recursively fetch the partials.\n     *\n     * @method cachePartials\n     * @param {string} templateName - should consist of the component and the name of the template like this:\n     *                              core/menu (lib/templates/menu.mustache) or\n     *                              tool_bananas/yellow (admin/tool/bananas/templates/yellow.mustache)\n     * @param {string} [themeName=config.theme]\n     * @param {Array} parentage - A list of requested partials in this render chain.\n     * @return {Promise} JQuery promise object resolved when all partials are in the cache.\n     */\n    static cachePartials(templateName, themeName = config.theme, parentage = []) {\n        const searchKey = this.getSearchKey(themeName, templateName);\n\n        if (searchKey in this.cachePartialPromises) {\n            return this.cachePartialPromises[searchKey];\n        }\n\n        // This promise will not be resolved until all child partials are also resolved and ready.\n        // We create it here to allow us to check for recursive inclusion of templates.\n        // Keep track of the requested partials in this chain.\n        if (!parentage.length) {\n            parentage.push(searchKey);\n        }\n\n        this.cachePartialPromises[searchKey] = $.Deferred();\n        this._cachePartials(templateName, themeName, parentage).catch((error) => {\n            this.cachePartialPromises[searchKey].reject(error);\n        });\n\n        return this.cachePartialPromises[searchKey];\n    }\n\n    /**\n     * Cache the template partials for the specified template.\n     *\n     * @param {string} templateName\n     * @param {string} themeName\n     * @param {array} parentage\n     * @returns {promise<string>}\n     */\n    static async _cachePartials(templateName, themeName, parentage) {\n        const searchKey = this.getSearchKey(themeName, templateName);\n        const templateSource = await this.getTemplate(templateName, themeName);\n        const partials = this.scanForPartials(templateSource);\n        const uniquePartials = partials.filter((partialName) => {\n            // Check for recursion.\n            if (parentage.indexOf(`${themeName}/${partialName}`) >= 0) {\n                // Ignore templates which include a parent template already requested in the current chain.\n                return false;\n            }\n\n            // Ignore templates that include themselves.\n            return partialName !== templateName;\n        });\n\n        // Fetch any partial which has not already been fetched.\n        const fetchThemAll = uniquePartials.map((partialName) => {\n            parentage.push(`${themeName}/${partialName}`);\n            return this.cachePartials(partialName, themeName, parentage);\n        });\n\n        await Promise.all(fetchThemAll);\n        return this.cachePartialPromises[searchKey].resolve(templateSource);\n    }\n\n    /**\n     * Take all of the templates waiting in the buffer and load them from the server\n     * or from the cache.\n     *\n     * All of the templates that need to be loaded from the server will be batched up\n     * and sent in a single network request.\n     */\n    static processLoadTemplateBuffer() {\n        if (!this.loadTemplateBuffer.length) {\n            return;\n        }\n\n        if (this.isLoadingTemplates) {\n            return;\n        }\n\n        this.isLoadingTemplates = true;\n        // Grab any templates waiting in the buffer.\n        const templatesToLoad = this.loadTemplateBuffer.slice();\n        // This will be resolved with the list of promises for the server request.\n        const serverRequestsDeferred = $.Deferred();\n        const requests = [];\n        // Get a list of promises for each of the templates we need to load.\n        const templatePromises = templatesToLoad.map((templateData) => {\n            const component = getNormalisedComponent(templateData.component);\n            const name = templateData.name;\n            const searchKey = templateData.searchKey;\n            const theme = templateData.theme;\n            const templateDeferred = templateData.deferred;\n            let promise = null;\n\n            // Double check to see if this template happened to have landed in the\n            // cache as a dependency of an earlier template.\n            if (this.hasTemplateInCache(searchKey)) {\n                // We've seen this template so immediately resolve the existing promise.\n                promise = this.getTemplatePromiseFromCache(searchKey);\n            } else {\n                // We haven't seen this template yet so we need to request it from\n                // the server.\n                requests.push({\n                    methodname: 'core_output_load_template_with_dependencies',\n                    args: {\n                        component,\n                        template: name,\n                        themename: theme,\n                        lang: $('html').attr('lang').replace(/-/g, '_')\n                    }\n                });\n                // Remember the index in the requests list for this template so that\n                // we can get the appropriate promise back.\n                const index = requests.length - 1;\n\n                // The server deferred will be resolved with a list of all of the promises\n                // that were sent in the order that they were added to the requests array.\n                promise = serverRequestsDeferred.promise()\n                    .then((promises) => {\n                        // The promise for this template will be the one that matches the index\n                        // for it's entry in the requests array.\n                        //\n                        // Make sure the promise is added to the promises cache for this template\n                        // search key so that we don't request it again.\n                        templatePromises[searchKey] = promises[index].then((response) => {\n                            // Process all of the template dependencies for this template and add\n                            // them to the caches so that we don't request them again later.\n                            response.templates.forEach((data) => {\n                                data.component = getNormalisedComponent(data.component);\n                                const tempSearchKey = this.getSearchKey(\n                                    theme,\n                                    [data.component, data.name].join('/'),\n                                );\n\n                                // Cache all of the dependent templates because we'll need them to render\n                                // the requested template.\n                                this.setTemplateInCache(tempSearchKey, data.value);\n\n                                if (config.templaterev > 0) {\n                                    // The template cache is enabled - set the value there.\n                                    storage.set(`core_template/${config.templaterev}:${tempSearchKey}`, data.value);\n                                }\n                            });\n\n                            if (response.strings.length) {\n                                // If we have strings that the template needs then warm the string cache\n                                // with them now so that we don't need to re-fetch them.\n                                str.cache_strings(response.strings.map(({component, name, value}) => ({\n                                    component: getNormalisedComponent(component),\n                                    key: name,\n                                    value,\n                                })));\n                            }\n\n                            // Return the original template source that the user requested.\n                            if (this.hasTemplateInCache(searchKey)) {\n                                return this.getTemplateFromCache(searchKey);\n                            }\n\n                            return null;\n                        });\n\n                        return templatePromises[searchKey];\n                    });\n            }\n\n            return promise\n                // When we've successfully loaded the template then resolve the deferred\n                // in the buffer so that all of the calling code can proceed.\n                .then((source) => templateDeferred.resolve(source))\n                .catch((error) => {\n                    // If there was an error loading the template then reject the deferred\n                    // in the buffer so that all of the calling code can proceed.\n                    templateDeferred.reject(error);\n                    // Rethrow for anyone else listening.\n                    throw error;\n                });\n        });\n\n        if (requests.length) {\n            // We have requests to send so resolve the deferred with the promises.\n            serverRequestsDeferred.resolve(ajax.call(requests, true, false, false, 0, config.templaterev));\n        } else {\n            // Nothing to load so we can resolve our deferred.\n            serverRequestsDeferred.resolve();\n        }\n\n        // Once we've finished loading all of the templates then recurse to process\n        // any templates that may have been added to the buffer in the time that we\n        // were fetching.\n        $.when.apply(null, templatePromises)\n            .then(() => {\n                // Remove the templates we've loaded from the buffer.\n                this.loadTemplateBuffer.splice(0, templatesToLoad.length);\n                this.isLoadingTemplates = false;\n                this.processLoadTemplateBuffer();\n                return;\n            })\n            .catch(() => {\n                // Remove the templates we've loaded from the buffer.\n                this.loadTemplateBuffer.splice(0, templatesToLoad.length);\n                this.isLoadingTemplates = false;\n                this.processLoadTemplateBuffer();\n            });\n    }\n\n    /**\n     * Search the various caches for a template promise for the given search key.\n     * The search key should be in the format <theme>/<component>/<template> e.g. boost/core/modal.\n     *\n     * If the template is found in any of the caches it will populate the other caches with\n     * the same data as well.\n     *\n     * @param {String} searchKey The template search key in the format <theme>/<component>/<template> e.g. boost/core/modal\n     * @returns {Object|null} jQuery promise resolved with the template source\n     */\n    static getTemplatePromiseFromCache(searchKey) {\n        // First try the cache of promises.\n        if (searchKey in this.templatePromises) {\n            return this.templatePromises[searchKey];\n        }\n\n        // Check the module cache.\n        if (this.hasTemplateInCache(searchKey)) {\n            const templateSource = this.getTemplateFromCache(searchKey);\n            // Add this to the promises cache for future.\n            this.templatePromises[searchKey] = $.Deferred().resolve(templateSource).promise();\n            return this.templatePromises[searchKey];\n        }\n\n        if (config.templaterev <= 0) {\n            // Template caching is disabled. Do not store in persistent storage.\n            return null;\n        }\n\n        // Now try local storage.\n        const cached = storage.get(`core_template/${config.templaterev}:${searchKey}`);\n        if (cached) {\n            // Add this to the module cache for future.\n            this.setTemplateInCache(searchKey, cached);\n\n            // Add to the promises cache for future.\n            this.templatePromises[searchKey] = $.Deferred().resolve(cached).promise();\n            return this.templatePromises[searchKey];\n        }\n\n        return null;\n    }\n}\n"],"names":["Loader","theme","templateName","themeName","config","searchKey","this","getSearchKey","cachedPromise","getTemplatePromiseFromCache","existingBufferRecords","loadTemplateBuffer","filter","record","length","deferred","promise","parts","split","component","shift","name","join","$","Deferred","push","processLoadTemplateBuffer","templateSource","templateCache","set","get","has","templateNames","forEach","prefetchTemplate","hasTemplateInCache","Error","getTemplateFromCache","tokens","mustache","parse","partials","findPartial","i","token","parentage","cachePartialPromises","_cachePartials","catch","error","reject","getTemplate","fetchThemAll","scanForPartials","partialName","indexOf","map","cachePartials","Promise","all","resolve","isLoadingTemplates","templatesToLoad","slice","serverRequestsDeferred","requests","templatePromises","templateData","templateDeferred","methodname","args","template","themename","lang","attr","replace","index","then","promises","response","templates","data","tempSearchKey","setTemplateInCache","value","templaterev","strings","str","cache_strings","_ref","key","source","ajax","call","when","apply","splice","cached","storage","Map"],"mappings":"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"}
\ No newline at end of file
+{"version":3,"file":"loader.min.js","sources":["../../../src/local/templates/loader.js"],"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\nimport $ from 'jquery';\nimport ajax from 'core/ajax';\nimport * as str from 'core/str';\nimport * as config from 'core/config';\nimport mustache from 'core/mustache';\nimport storage from 'core/localstorage';\nimport {getNormalisedComponent} from 'core/utils';\n\n/**\n * Template this.\n *\n * @module     core/local/templates/loader\n * @copyright  2023 Andrew Lyons <andrew@nicols.co.uk>\n * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later\n * @since      4.3\n */\nexport default class Loader {\n    /** @var {String} themeName for the current render */\n    currentThemeName = '';\n\n    /** @var {Object[]} loadTemplateBuffer - List of templates to be loaded */\n    static loadTemplateBuffer = [];\n\n    /** @var {Bool} isLoadingTemplates - Whether templates are currently being loaded */\n    static isLoadingTemplates = false;\n\n    /** @var {Map} templateCache - Cache of already loaded template strings */\n    static templateCache = new Map();\n\n    /** @var {Promise[]} templatePromises - Cache of already loaded template promises */\n    static templatePromises = {};\n\n    /** @var {Promise[]} cachePartialPromises - Cache of already loaded template partial promises */\n    static cachePartialPromises = [];\n\n    /**\n     * A helper to get the search key\n     *\n     * @param {string} theme\n     * @param {string} templateName\n     * @returns {string}\n     */\n    static getSearchKey(theme, templateName) {\n        return `${theme}/${templateName}`;\n    }\n\n    /**\n     * Load a template.\n     *\n     * @method getTemplate\n     * @param {string} templateName - should consist of the component and the name of the template like this:\n     *                              core/menu (lib/templates/menu.mustache) or\n     *                              tool_bananas/yellow (admin/tool/bananas/templates/yellow.mustache)\n     * @param {string} [themeName=config.theme] - The theme to load the template from\n     * @return {Promise} JQuery promise object resolved when the template has been fetched.\n     */\n    static getTemplate(templateName, themeName = config.theme) {\n        const searchKey = this.getSearchKey(themeName, templateName);\n\n        // If we haven't already seen this template then buffer it.\n        const cachedPromise = this.getTemplatePromiseFromCache(searchKey);\n        if (cachedPromise) {\n            return cachedPromise;\n        }\n\n        // Check the buffer to see if this template has already been added.\n        const existingBufferRecords = this.loadTemplateBuffer.filter((record) => record.searchKey === searchKey);\n        if (existingBufferRecords.length) {\n            // This template is already in the buffer so just return the existing\n            // promise. No need to add it to the buffer again.\n            return existingBufferRecords[0].deferred.promise();\n        }\n\n        // This is the first time this has been requested so let's add it to the buffer\n        // to be loaded.\n        const parts = templateName.split('/');\n        const component = getNormalisedComponent(parts.shift());\n        const name = parts.join('/');\n        const deferred = $.Deferred();\n\n        // Add this template to the buffer to be loaded.\n        this.loadTemplateBuffer.push({\n            component,\n            name,\n            theme: themeName,\n            searchKey,\n            deferred,\n        });\n\n        // We know there is at least one thing in the buffer so kick off a processing run.\n        this.processLoadTemplateBuffer();\n        return deferred.promise();\n    }\n\n    /**\n     * Store a template in the cache.\n     *\n     * @param {string} searchKey\n     * @param {string} templateSource\n     */\n    static setTemplateInCache(searchKey, templateSource) {\n        // Cache all of the dependent templates because we'll need them to render\n        // the requested template.\n        this.templateCache.set(searchKey, templateSource);\n    }\n\n    /**\n     * Fetch a template from the cache.\n     *\n     * @param {string} searchKey\n     * @returns {string}\n     */\n    static getTemplateFromCache(searchKey) {\n        return this.templateCache.get(searchKey);\n    }\n\n    /**\n     * Check whether a template is in the cache.\n     *\n     * @param {string} searchKey\n     * @returns {bool}\n     */\n    static hasTemplateInCache(searchKey) {\n        return this.templateCache.has(searchKey);\n    }\n\n    /**\n     * Prefetch a set of templates without rendering them.\n     *\n     * @param {Array} templateNames The list of templates to fetch\n     * @param {string} themeName\n     */\n    static prefetchTemplates(templateNames, themeName) {\n        templateNames.forEach((templateName) => this.prefetchTemplate(templateName, themeName));\n    }\n\n    /**\n     * Prefetech a sginle template without rendering it.\n     *\n     * @param {string} templateName\n     * @param {string} themeName\n     */\n    static prefetchTemplate(templateName, themeName) {\n        const searchKey = this.getSearchKey(themeName, templateName);\n\n        // If we haven't already seen this template then buffer it.\n        if (this.hasTemplateInCache(searchKey)) {\n            return;\n        }\n\n        // Check the buffer to see if this template has already been added.\n        const existingBufferRecords = this.loadTemplateBuffer.filter((record) => record.searchKey === searchKey);\n\n        if (existingBufferRecords.length) {\n            // This template is already in the buffer so just return the existing promise.\n            // No need to add it to the buffer again.\n            return;\n        }\n\n        // This is the first time this has been requested so let's add it to the buffer to be loaded.\n        const parts = templateName.split('/');\n        const component = getNormalisedComponent(parts.shift());\n        const name = parts.join('/');\n\n        // Add this template to the buffer to be loaded.\n        this.loadTemplateBuffer.push({\n            component,\n            name,\n            theme: themeName,\n            searchKey,\n            deferred: $.Deferred(),\n        });\n\n        this.processLoadTemplateBuffer();\n    }\n\n    /**\n     * Load a partial from the cache or ajax.\n     *\n     * @method partialHelper\n     * @param {string} name The partial name to load.\n     * @param {string} [themeName = config.theme] The theme to load the partial from.\n     * @return {string}\n     */\n    static partialHelper(name, themeName = config.theme) {\n        const searchKey = this.getSearchKey(themeName, name);\n\n        if (!this.hasTemplateInCache(searchKey)) {\n            new Error(`Failed to pre-fetch the template: ${name}`);\n        }\n        return this.getTemplateFromCache(searchKey);\n    }\n\n    /**\n     * Scan a template source for partial tags and return a list of the found partials.\n     *\n     * @method scanForPartials\n     * @param {string} templateSource - source template to scan.\n     * @return {Array} List of partials.\n     */\n    static scanForPartials(templateSource) {\n        const tokens = mustache.parse(templateSource);\n        const partials = [];\n\n        const findPartial = (tokens, partials) => {\n            let i;\n            for (i = 0; i < tokens.length; i++) {\n                const token = tokens[i];\n                if (token[0] == '>' || token[0] == '<') {\n                    partials.push(token[1]);\n                }\n                if (token.length > 4) {\n                    findPartial(token[4], partials);\n                }\n            }\n        };\n\n        findPartial(tokens, partials);\n\n        return partials;\n    }\n\n    /**\n     * Load a template and scan it for partials. Recursively fetch the partials.\n     *\n     * @method cachePartials\n     * @param {string} templateName - should consist of the component and the name of the template like this:\n     *                              core/menu (lib/templates/menu.mustache) or\n     *                              tool_bananas/yellow (admin/tool/bananas/templates/yellow.mustache)\n     * @param {string} [themeName=config.theme]\n     * @param {Array} parentage - A list of requested partials in this render chain.\n     * @return {Promise} JQuery promise object resolved when all partials are in the cache.\n     */\n    static cachePartials(templateName, themeName = config.theme, parentage = []) {\n        const searchKey = this.getSearchKey(themeName, templateName);\n\n        if (searchKey in this.cachePartialPromises) {\n            return this.cachePartialPromises[searchKey];\n        }\n\n        // This promise will not be resolved until all child partials are also resolved and ready.\n        // We create it here to allow us to check for recursive inclusion of templates.\n        // Keep track of the requested partials in this chain.\n        if (!parentage.length) {\n            parentage.push(searchKey);\n        }\n\n        this.cachePartialPromises[searchKey] = $.Deferred();\n        this._cachePartials(templateName, themeName, parentage).catch((error) => {\n            this.cachePartialPromises[searchKey].reject(error);\n        });\n\n        return this.cachePartialPromises[searchKey];\n    }\n\n    /**\n     * Cache the template partials for the specified template.\n     *\n     * @param {string} templateName\n     * @param {string} themeName\n     * @param {array} parentage\n     * @returns {promise<string>}\n     */\n    static async _cachePartials(templateName, themeName, parentage) {\n        const searchKey = this.getSearchKey(themeName, templateName);\n        const templateSource = await this.getTemplate(templateName, themeName);\n        const partials = this.scanForPartials(templateSource);\n        const uniquePartials = partials.filter((partialName) => {\n            // Check for recursion.\n            if (parentage.indexOf(`${themeName}/${partialName}`) >= 0) {\n                // Ignore templates which include a parent template already requested in the current chain.\n                return false;\n            }\n\n            // Ignore templates that include themselves.\n            return partialName !== templateName;\n        });\n\n        // Fetch any partial which has not already been fetched.\n        const fetchThemAll = uniquePartials.map((partialName) => {\n            parentage.push(`${themeName}/${partialName}`);\n            return this.cachePartials(partialName, themeName, parentage);\n        });\n\n        await Promise.all(fetchThemAll);\n        return this.cachePartialPromises[searchKey].resolve(templateSource);\n    }\n\n    /**\n     * Take all of the templates waiting in the buffer and load them from the server\n     * or from the cache.\n     *\n     * All of the templates that need to be loaded from the server will be batched up\n     * and sent in a single network request.\n     */\n    static processLoadTemplateBuffer() {\n        if (!this.loadTemplateBuffer.length) {\n            return;\n        }\n\n        if (this.isLoadingTemplates) {\n            return;\n        }\n\n        this.isLoadingTemplates = true;\n        // Grab any templates waiting in the buffer.\n        const templatesToLoad = this.loadTemplateBuffer.slice();\n        // This will be resolved with the list of promises for the server request.\n        const serverRequestsDeferred = $.Deferred();\n        const requests = [];\n        // Get a list of promises for each of the templates we need to load.\n        const templatePromises = templatesToLoad.map((templateData) => {\n            const component = getNormalisedComponent(templateData.component);\n            const name = templateData.name;\n            const searchKey = templateData.searchKey;\n            const theme = templateData.theme;\n            const templateDeferred = templateData.deferred;\n            let promise = null;\n\n            // Double check to see if this template happened to have landed in the\n            // cache as a dependency of an earlier template.\n            if (this.hasTemplateInCache(searchKey)) {\n                // We've seen this template so immediately resolve the existing promise.\n                promise = this.getTemplatePromiseFromCache(searchKey);\n            } else {\n                // We haven't seen this template yet so we need to request it from\n                // the server.\n                requests.push({\n                    methodname: 'core_output_load_template_with_dependencies',\n                    args: {\n                        component,\n                        template: name,\n                        themename: theme,\n                        lang: config.language,\n                    }\n                });\n                // Remember the index in the requests list for this template so that\n                // we can get the appropriate promise back.\n                const index = requests.length - 1;\n\n                // The server deferred will be resolved with a list of all of the promises\n                // that were sent in the order that they were added to the requests array.\n                promise = serverRequestsDeferred.promise()\n                    .then((promises) => {\n                        // The promise for this template will be the one that matches the index\n                        // for it's entry in the requests array.\n                        //\n                        // Make sure the promise is added to the promises cache for this template\n                        // search key so that we don't request it again.\n                        templatePromises[searchKey] = promises[index].then((response) => {\n                            // Process all of the template dependencies for this template and add\n                            // them to the caches so that we don't request them again later.\n                            response.templates.forEach((data) => {\n                                data.component = getNormalisedComponent(data.component);\n                                const tempSearchKey = this.getSearchKey(\n                                    theme,\n                                    [data.component, data.name].join('/'),\n                                );\n\n                                // Cache all of the dependent templates because we'll need them to render\n                                // the requested template.\n                                this.setTemplateInCache(tempSearchKey, data.value);\n\n                                if (config.templaterev > 0) {\n                                    // The template cache is enabled - set the value there.\n                                    storage.set(`core_template/${config.templaterev}:${tempSearchKey}`, data.value);\n                                }\n                            });\n\n                            if (response.strings.length) {\n                                // If we have strings that the template needs then warm the string cache\n                                // with them now so that we don't need to re-fetch them.\n                                str.cache_strings(response.strings.map(({component, name, value}) => ({\n                                    component: getNormalisedComponent(component),\n                                    key: name,\n                                    value,\n                                })));\n                            }\n\n                            // Return the original template source that the user requested.\n                            if (this.hasTemplateInCache(searchKey)) {\n                                return this.getTemplateFromCache(searchKey);\n                            }\n\n                            return null;\n                        });\n\n                        return templatePromises[searchKey];\n                    });\n            }\n\n            return promise\n                // When we've successfully loaded the template then resolve the deferred\n                // in the buffer so that all of the calling code can proceed.\n                .then((source) => templateDeferred.resolve(source))\n                .catch((error) => {\n                    // If there was an error loading the template then reject the deferred\n                    // in the buffer so that all of the calling code can proceed.\n                    templateDeferred.reject(error);\n                    // Rethrow for anyone else listening.\n                    throw error;\n                });\n        });\n\n        if (requests.length) {\n            // We have requests to send so resolve the deferred with the promises.\n            serverRequestsDeferred.resolve(ajax.call(requests, true, false, false, 0, config.templaterev));\n        } else {\n            // Nothing to load so we can resolve our deferred.\n            serverRequestsDeferred.resolve();\n        }\n\n        // Once we've finished loading all of the templates then recurse to process\n        // any templates that may have been added to the buffer in the time that we\n        // were fetching.\n        $.when.apply(null, templatePromises)\n            .then(() => {\n                // Remove the templates we've loaded from the buffer.\n                this.loadTemplateBuffer.splice(0, templatesToLoad.length);\n                this.isLoadingTemplates = false;\n                this.processLoadTemplateBuffer();\n                return;\n            })\n            .catch(() => {\n                // Remove the templates we've loaded from the buffer.\n                this.loadTemplateBuffer.splice(0, templatesToLoad.length);\n                this.isLoadingTemplates = false;\n                this.processLoadTemplateBuffer();\n            });\n    }\n\n    /**\n     * Search the various caches for a template promise for the given search key.\n     * The search key should be in the format <theme>/<component>/<template> e.g. boost/core/modal.\n     *\n     * If the template is found in any of the caches it will populate the other caches with\n     * the same data as well.\n     *\n     * @param {String} searchKey The template search key in the format <theme>/<component>/<template> e.g. boost/core/modal\n     * @returns {Object|null} jQuery promise resolved with the template source\n     */\n    static getTemplatePromiseFromCache(searchKey) {\n        // First try the cache of promises.\n        if (searchKey in this.templatePromises) {\n            return this.templatePromises[searchKey];\n        }\n\n        // Check the module cache.\n        if (this.hasTemplateInCache(searchKey)) {\n            const templateSource = this.getTemplateFromCache(searchKey);\n            // Add this to the promises cache for future.\n            this.templatePromises[searchKey] = $.Deferred().resolve(templateSource).promise();\n            return this.templatePromises[searchKey];\n        }\n\n        if (config.templaterev <= 0) {\n            // Template caching is disabled. Do not store in persistent storage.\n            return null;\n        }\n\n        // Now try local storage.\n        const cached = storage.get(`core_template/${config.templaterev}:${searchKey}`);\n        if (cached) {\n            // Add this to the module cache for future.\n            this.setTemplateInCache(searchKey, cached);\n\n            // Add to the promises cache for future.\n            this.templatePromises[searchKey] = $.Deferred().resolve(cached).promise();\n            return this.templatePromises[searchKey];\n        }\n\n        return null;\n    }\n}\n"],"names":["Loader","theme","templateName","themeName","config","searchKey","this","getSearchKey","cachedPromise","getTemplatePromiseFromCache","existingBufferRecords","loadTemplateBuffer","filter","record","length","deferred","promise","parts","split","component","shift","name","join","$","Deferred","push","processLoadTemplateBuffer","templateSource","templateCache","set","get","has","templateNames","forEach","prefetchTemplate","hasTemplateInCache","Error","getTemplateFromCache","tokens","mustache","parse","partials","findPartial","i","token","parentage","cachePartialPromises","_cachePartials","catch","error","reject","getTemplate","fetchThemAll","scanForPartials","partialName","indexOf","map","cachePartials","Promise","all","resolve","isLoadingTemplates","templatesToLoad","slice","serverRequestsDeferred","requests","templatePromises","templateData","templateDeferred","methodname","args","template","themename","lang","language","index","then","promises","response","templates","data","tempSearchKey","setTemplateInCache","value","templaterev","strings","str","cache_strings","_ref","key","source","ajax","call","when","apply","splice","cached","storage","Map"],"mappings":"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"}
\ No newline at end of file
diff --git a/lib/amd/build/str.min.js b/lib/amd/build/str.min.js
index 891bceb4289..5d25aba70d1 100644
--- a/lib/amd/build/str.min.js
+++ b/lib/amd/build/str.min.js
@@ -1,4 +1,4 @@
-define("core/str",["exports","jquery","core/ajax","core/localstorage"],(function(_exports,_jquery,_ajax,_localstorage){function _interopRequireDefault(obj){return obj&&obj.__esModule?obj:{default:obj}}
+define("core/str",["exports","jquery","core/ajax","core/config","core/localstorage"],(function(_exports,_jquery,_ajax,_config,_localstorage){function _interopRequireDefault(obj){return obj&&obj.__esModule?obj:{default:obj}}
 /**
    * Fetch and return language strings.
    *
@@ -7,6 +7,6 @@ define("core/str",["exports","jquery","core/ajax","core/localstorage"],(function
    * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
    * @since      2.9
    *
-   */Object.defineProperty(_exports,"__esModule",{value:!0}),_exports.get_strings=_exports.get_string=_exports.getStrings=_exports.getString=_exports.cache_strings=void 0,_jquery=_interopRequireDefault(_jquery),_ajax=_interopRequireDefault(_ajax),_localstorage=_interopRequireDefault(_localstorage);let promiseCache=[];_exports.get_string=(key,component,param,lang)=>get_strings([{key:key,component:component,param:param,lang:lang}]).then((results=>results[0]));_exports.getString=(key,component,param,lang)=>getRequestedStrings([{key:key,component:component,param:param,lang:lang}])[0];_exports.getStrings=requests=>Promise.all(getRequestedStrings(requests));const getRequestedStrings=requests=>{let requestData=[];const pageLang=(0,_jquery.default)("html").attr("lang").replace(/-/g,"_"),stringPromises=requests.map((request=>{let{component:component,key:key,param:param,lang:lang=pageLang}=request;component||(component="core");const cacheKey=(_ref=>{let{key:key,component:component,lang:lang=pageLang}=_ref;return"core_str/".concat(key,"/").concat(component,"/").concat(lang)})({key:key,component:component,lang:lang}),buildReturn=promise=>(promiseCache[cacheKey]=promise,promise);if(component in M.str&&key in M.str[component])return buildReturn(new Promise((resolve=>{resolve(M.util.get_string(key,component,param,lang))})));const cached=_localstorage.default.get(cacheKey);return cached?(M.str[component]={...M.str[component],[key]:cached},buildReturn(new Promise((resolve=>{resolve(M.util.get_string(key,component,param,lang))})))):cacheKey in promiseCache?buildReturn(promiseCache[cacheKey]).then((()=>M.util.get_string(key,component,param,lang))):buildReturn(new Promise(((resolve,reject)=>{requestData.push({methodname:"core_get_string",args:{stringid:key,stringparams:[],component:component,lang:lang},done:str=>{M.str[component]={...M.str[component],[key]:str},_localstorage.default.set(cacheKey,str),resolve(M.util.get_string(key,component,param,lang))},fail:reject})})))}));return requestData.length&&_ajax.default.call(requestData,!0,!1,!1,0,M.cfg.langrev),stringPromises},get_strings=requests=>_jquery.default.when.apply(_jquery.default,getRequestedStrings(requests)).then((function(){for(var _len=arguments.length,strings=new Array(_len),_key=0;_key<_len;_key++)strings[_key]=arguments[_key];return strings}));_exports.get_strings=get_strings;_exports.cache_strings=strings=>{const defaultLang=(0,_jquery.default)("html").attr("lang").replace(/-/g,"_");strings.forEach((_ref2=>{let{key:key,component:component,value:value,lang:lang=defaultLang}=_ref2;const cacheKey=["core_str",key,component,lang].join("/");component in M.str&&key in M.str[component]||(component in M.str||(M.str[component]={}),M.str[component][key]=value),_localstorage.default.get(cacheKey)||_localstorage.default.set(cacheKey,value),cacheKey in promiseCache||(promiseCache[cacheKey]=_jquery.default.Deferred().resolve(value).promise())}))}}));
+   */Object.defineProperty(_exports,"__esModule",{value:!0}),_exports.get_strings=_exports.get_string=_exports.getStrings=_exports.getString=_exports.cache_strings=void 0,_jquery=_interopRequireDefault(_jquery),_ajax=_interopRequireDefault(_ajax),_config=_interopRequireDefault(_config),_localstorage=_interopRequireDefault(_localstorage);let promiseCache=[];_exports.get_string=(key,component,param,lang)=>get_strings([{key:key,component:component,param:param,lang:lang}]).then((results=>results[0]));_exports.getString=(key,component,param,lang)=>getRequestedStrings([{key:key,component:component,param:param,lang:lang}])[0];_exports.getStrings=requests=>Promise.all(getRequestedStrings(requests));const getRequestedStrings=requests=>{let requestData=[];const pageLang=_config.default.language,stringPromises=requests.map((request=>{let{component:component,key:key,param:param,lang:lang=pageLang}=request;component||(component="core");const cacheKey=(_ref=>{let{key:key,component:component,lang:lang=pageLang}=_ref;return"core_str/".concat(key,"/").concat(component,"/").concat(lang)})({key:key,component:component,lang:lang}),buildReturn=promise=>(promiseCache[cacheKey]=promise,promise);if(component in M.str&&key in M.str[component])return buildReturn(new Promise((resolve=>{resolve(M.util.get_string(key,component,param,lang))})));const cached=_localstorage.default.get(cacheKey);return cached?(M.str[component]={...M.str[component],[key]:cached},buildReturn(new Promise((resolve=>{resolve(M.util.get_string(key,component,param,lang))})))):cacheKey in promiseCache?buildReturn(promiseCache[cacheKey]).then((()=>M.util.get_string(key,component,param,lang))):buildReturn(new Promise(((resolve,reject)=>{requestData.push({methodname:"core_get_string",args:{stringid:key,stringparams:[],component:component,lang:lang},done:str=>{M.str[component]={...M.str[component],[key]:str},_localstorage.default.set(cacheKey,str),resolve(M.util.get_string(key,component,param,lang))},fail:reject})})))}));return requestData.length&&_ajax.default.call(requestData,!0,!1,!1,0,M.cfg.langrev),stringPromises},get_strings=requests=>_jquery.default.when.apply(_jquery.default,getRequestedStrings(requests)).then((function(){for(var _len=arguments.length,strings=new Array(_len),_key=0;_key<_len;_key++)strings[_key]=arguments[_key];return strings}));_exports.get_strings=get_strings;_exports.cache_strings=strings=>{strings.forEach((_ref2=>{let{key:key,component:component,value:value,lang:lang=_config.default.language}=_ref2;const cacheKey=["core_str",key,component,lang].join("/");component in M.str&&key in M.str[component]||(component in M.str||(M.str[component]={}),M.str[component][key]=value),_localstorage.default.get(cacheKey)||_localstorage.default.set(cacheKey,value),cacheKey in promiseCache||(promiseCache[cacheKey]=_jquery.default.Deferred().resolve(value).promise())}))}}));
 
 //# sourceMappingURL=str.min.js.map
\ No newline at end of file
diff --git a/lib/amd/build/str.min.js.map b/lib/amd/build/str.min.js.map
index 6a8ddbc3028..87a0bd772af 100644
--- a/lib/amd/build/str.min.js.map
+++ b/lib/amd/build/str.min.js.map
@@ -1 +1 @@
-{"version":3,"file":"str.min.js","sources":["../src/str.js"],"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 * Fetch and return language strings.\n *\n * @module     core/str\n * @copyright  2015 Damyon Wiese <damyon@moodle.com>\n * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later\n * @since      2.9\n *\n */\nimport $ from 'jquery';\nimport Ajax from 'core/ajax';\nimport LocalStorage from 'core/localstorage';\n\n/**\n * @typedef StringRequest\n * @type {object}\n * @param {string} requests.key The string identifer to fetch\n * @param {string} [requests.component='core'] The componet to fetch from\n * @param {string} [requests.lang] The language to fetch a string for. Defaults to current page language.\n * @param {object|string} [requests.param] The param for variable expansion in the string.\n */\n\n// Module cache for the promises so that we don't make multiple\n// unnecessary requests.\nlet promiseCache = [];\n\n/* eslint-disable no-restricted-properties */\n\n/**\n * Return a Promise that resolves to a string.\n *\n * If the string has previously been cached, then the Promise will be resolved immediately, otherwise it will be fetched\n * from the server and resolved when available.\n *\n * @param {string} key The language string key\n * @param {string} component The language string component\n * @param {string} param The param for variable expansion in the string.\n * @param {string} lang The users language - if not passed it is deduced.\n * @return {jQuery.Promise} A jQuery Promise containing the translated string\n *\n * @example <caption>Fetching a string</caption>\n *\n * import {getString} from 'core/str';\n * get_string('cannotfindteacher', 'error')\n * .then((str) => window.console.log(str)); // Cannot find teacher\n */\n// eslint-disable-next-line camelcase\nexport const get_string = (key, component, param, lang) => {\n    return get_strings([{key, component, param, lang}])\n        .then(results => results[0]);\n};\n\n/**\n * Return a Promise that resolves to a string.\n *\n * If the string has previously been cached, then the Promise will be resolved immediately, otherwise it will be fetched\n * from the server and resolved when available.\n *\n * @param {string} key The language string key\n * @param {string} component The language string component\n * @param {string} param The param for variable expansion in the string.\n * @param {string} lang The users language - if not passed it is deduced.\n * @return {Promise} A native Promise containing the translated string\n *\n * @example <caption>Fetching a string</caption>\n *\n * import {getString} from 'core/str';\n *\n * getString('cannotfindteacher', 'error')\n * .then((str) => window.console.log(str)); // Cannot find teacher\n */\nexport const getString = (key, component, param, lang) => getRequestedStrings([{key, component, param, lang}])[0];\n\n// eslint-disable-next-line camelcase\n/**\n * Make a batch request to load a set of strings.\n *\n * Any missing string will be fetched from the server.\n * The Promise will only be resolved once all strings are available, or an attempt has been made to fetch them.\n *\n * @param {Array.<StringRequest>} requests List of strings to fetch\n * @return {Promise[]} An array of native promises containing the translated strings\n *\n * @example <caption>Fetching a set of strings</caption>\n *\n * import {getStrings} from 'core/str';\n * getStrings([\n *     {\n *         key: 'cannotfindteacher',\n *         component: 'error',\n *     },\n *     {\n *         key: 'yes',\n *         component: 'core',\n *     },\n *     {\n *         key: 'no',\n *         component: 'core',\n *     },\n * ])\n * .then((cannotFindTeacher, yes, no) => {\n *     window.console.log(cannotFindTeacher); // Cannot find teacher\n *     window.console.log(yes); // Yes\n *     window.console.log(no); // No\n * });\n */\nexport const getStrings = (requests) => Promise.all(getRequestedStrings(requests));\n\n/**\n * Internal function to perform the string requests.\n *\n * @param {Array.<StringRequest>} requests List of strings to fetch\n * @returns {Promise<string>}\n */\nconst getRequestedStrings = (requests) => {\n    let requestData = [];\n    const pageLang = $('html').attr('lang').replace(/-/g, '_');\n\n    // Helper function to construct the cache key.\n    const getCacheKey = ({key, component, lang = pageLang}) => `core_str/${key}/${component}/${lang}`;\n\n    const stringPromises = requests.map((request) => {\n        let {component, key, param, lang = pageLang} = request;\n        if (!component) {\n            component = 'core';\n        }\n\n        const cacheKey = getCacheKey({key, component, lang});\n\n        // Helper function to add the promise to cache.\n        const buildReturn = (promise) => {\n            // Make sure the promise cache contains our promise.\n            promiseCache[cacheKey] = promise;\n            return promise;\n        };\n\n        // Check if we can serve the string straight from M.str.\n        if (component in M.str && key in M.str[component]) {\n            return buildReturn(new Promise((resolve) => {\n                resolve(M.util.get_string(key, component, param, lang));\n            }));\n        }\n\n        // Check if the string is in the browser's local storage.\n        const cached = LocalStorage.get(cacheKey);\n        if (cached) {\n            M.str[component] = {...M.str[component], [key]: cached};\n            return buildReturn(new Promise((resolve) => {\n                resolve(M.util.get_string(key, component, param, lang));\n            }));\n        }\n\n        // Check if we've already loaded this string from the server.\n        if (cacheKey in promiseCache) {\n            return buildReturn(promiseCache[cacheKey]).then(() => {\n                return M.util.get_string(key, component, param, lang);\n            });\n        } else {\n            // We're going to have to ask the server for the string so\n            // add this string to the list of requests to be sent.\n            return buildReturn(new Promise((resolve, reject) => {\n                requestData.push({\n                    methodname: 'core_get_string',\n                    args: {\n                        stringid: key,\n                        stringparams: [],\n                        component,\n                        lang,\n                    },\n                    done: (str) => {\n                        // When we get the response from the server\n                        // we should update M.str and the browser's\n                        // local storage before resolving this promise.\n                        M.str[component] = {...M.str[component], [key]: str};\n                        LocalStorage.set(cacheKey, str);\n                        resolve(M.util.get_string(key, component, param, lang));\n                    },\n                    fail: reject\n                });\n            }));\n        }\n    });\n\n    if (requestData.length) {\n        // If we need to load any strings from the server then send\n        // off the request.\n        Ajax.call(requestData, true, false, false, 0, M.cfg.langrev);\n    }\n\n    return stringPromises;\n};\n\n/**\n * Make a batch request to load a set of strings.\n *\n * Any missing string will be fetched from the server.\n * The Promise will only be resolved once all strings are available, or an attempt has been made to fetch them.\n *\n * @param {Array.<StringRequest>} requests List of strings to fetch\n * @return {Promise[]} An array of native promises containing the translated strings\n *\n * @example <caption>Fetching a set of strings</caption>\n *\n * import {getStrings} from 'core/str';\n * get_strings([\n *     {\n *         key: 'cannotfindteacher',\n *         component: 'error',\n *     },\n *     {\n *         key: 'yes',\n *         component: 'core',\n *     },\n *     {\n *         key: 'no',\n *         component: 'core',\n *     },\n * ])\n * .then((cannotFindTeacher, yes, no) => {\n *     window.console.log(cannotFindTeacher); // Cannot find teacher\n *     window.console.log(yes); // Yes\n *     window.console.log(no); // No\n * });\n */\n// eslint-disable-next-line camelcase\nexport const get_strings = (requests) => {\n    // We need to use jQuery here because some calling code uses the\n    // .done handler instead of the .then handler.\n    return $.when.apply($, getRequestedStrings(requests))\n        .then((...strings) => strings);\n};\n\n/**\n * Add a list of strings to the caches.\n *\n * This function should typically only be called from core APIs to pre-cache values.\n *\n * @method cache_strings\n * @protected\n * @param {Object[]} strings List of strings to fetch\n * @param {string} strings.key The string identifer to fetch\n * @param {string} strings.value The string value\n * @param {string} [strings.component='core'] The componet to fetch from\n * @param {string} [strings.lang] The language to fetch a string for. Defaults to current page language.\n */\n// eslint-disable-next-line camelcase\nexport const cache_strings = (strings) => {\n    const defaultLang = $('html').attr('lang').replace(/-/g, '_');\n\n    strings.forEach(({key, component, value, lang = defaultLang}) => {\n        const cacheKey = ['core_str', key, component, lang].join('/');\n\n        // Check M.str caching.\n        if (!(component in M.str) || !(key in M.str[component])) {\n            if (!(component in M.str)) {\n                M.str[component] = {};\n            }\n\n            M.str[component][key] = value;\n        }\n\n        // Check local storage.\n        if (!LocalStorage.get(cacheKey)) {\n            LocalStorage.set(cacheKey, value);\n        }\n\n        // Check the promises cache.\n        if (!(cacheKey in promiseCache)) {\n            promiseCache[cacheKey] = $.Deferred().resolve(value).promise();\n        }\n    });\n};\n/* eslint-enable no-restricted-properties */\n"],"names":["promiseCache","key","component","param","lang","get_strings","then","results","getRequestedStrings","requests","Promise","all","requestData","pageLang","attr","replace","stringPromises","map","request","cacheKey","_ref","getCacheKey","buildReturn","promise","M","str","resolve","util","get_string","cached","LocalStorage","get","reject","push","methodname","args","stringid","stringparams","done","set","fail","length","call","cfg","langrev","$","when","apply","strings","defaultLang","forEach","_ref2","value","join","Deferred"],"mappings":";;;;;;;;;+SAuCIA,aAAe,uBAuBO,CAACC,IAAKC,UAAWC,MAAOC,OACvCC,YAAY,CAAC,CAACJ,IAAAA,IAAKC,UAAAA,UAAWC,MAAAA,MAAOC,KAAAA,QACvCE,MAAKC,SAAWA,QAAQ,wBAsBR,CAACN,IAAKC,UAAWC,MAAOC,OAASI,oBAAoB,CAAC,CAACP,IAAAA,IAAKC,UAAAA,UAAWC,MAAAA,MAAOC,KAAAA,QAAQ,uBAmCpFK,UAAaC,QAAQC,IAAIH,oBAAoBC,iBAQlED,oBAAuBC,eACrBG,YAAc,SACZC,UAAW,mBAAE,QAAQC,KAAK,QAAQC,QAAQ,KAAM,KAKhDC,eAAiBP,SAASQ,KAAKC,cAC7BhB,UAACA,UAADD,IAAYA,IAAZE,MAAiBA,MAAjBC,KAAwBA,KAAOS,UAAYK,QAC1ChB,YACDA,UAAY,cAGViB,SARUC,CAAAA,WAACnB,IAACA,IAADC,UAAMA,UAANE,KAAiBA,KAAOS,wCAA0BZ,gBAAOC,sBAAaE,OAQtEiB,CAAY,CAACpB,IAAAA,IAAKC,UAAAA,UAAWE,KAAAA,OAGxCkB,YAAeC,UAEjBvB,aAAamB,UAAYI,QAClBA,YAIPrB,aAAasB,EAAEC,KAAOxB,OAAOuB,EAAEC,IAAIvB,kBAC5BoB,YAAY,IAAIZ,SAASgB,UAC5BA,QAAQF,EAAEG,KAAKC,WAAW3B,IAAKC,UAAWC,MAAOC,iBAKnDyB,OAASC,sBAAaC,IAAIZ,iBAC5BU,QACAL,EAAEC,IAAIvB,WAAa,IAAIsB,EAAEC,IAAIvB,YAAaD,KAAM4B,QACzCP,YAAY,IAAIZ,SAASgB,UAC5BA,QAAQF,EAAEG,KAAKC,WAAW3B,IAAKC,UAAWC,MAAOC,YAKrDe,YAAYnB,aACLsB,YAAYtB,aAAamB,WAAWb,MAAK,IACrCkB,EAAEG,KAAKC,WAAW3B,IAAKC,UAAWC,MAAOC,QAK7CkB,YAAY,IAAIZ,SAAQ,CAACgB,QAASM,UACrCpB,YAAYqB,KAAK,CACbC,WAAY,kBACZC,KAAM,CACFC,SAAUnC,IACVoC,aAAc,GACdnC,UAAAA,UACAE,KAAAA,MAEJkC,KAAOb,MAIHD,EAAEC,IAAIvB,WAAa,IAAIsB,EAAEC,IAAIvB,YAAaD,KAAMwB,2BACnCc,IAAIpB,SAAUM,KAC3BC,QAAQF,EAAEG,KAAKC,WAAW3B,IAAKC,UAAWC,MAAOC,QAErDoC,KAAMR,uBAMlBpB,YAAY6B,sBAGPC,KAAK9B,aAAa,GAAM,GAAO,EAAO,EAAGY,EAAEmB,IAAIC,SAGjD5B,gBAoCEX,YAAeI,UAGjBoC,gBAAEC,KAAKC,MAAMF,gBAAGrC,oBAAoBC,WACtCH,MAAK,yCAAI0C,gDAAAA,qCAAYA,mEAiBAA,gBACpBC,aAAc,mBAAE,QAAQnC,KAAK,QAAQC,QAAQ,KAAM,KAEzDiC,QAAQE,SAAQC,YAAClD,IAACA,IAADC,UAAMA,UAANkD,MAAiBA,MAAjBhD,KAAwBA,KAAO6C,yBACtC9B,SAAW,CAAC,WAAYlB,IAAKC,UAAWE,MAAMiD,KAAK,KAGnDnD,aAAasB,EAAEC,KAAUxB,OAAOuB,EAAEC,IAAIvB,aAClCA,aAAasB,EAAEC,MACjBD,EAAEC,IAAIvB,WAAa,IAGvBsB,EAAEC,IAAIvB,WAAWD,KAAOmD,OAIvBtB,sBAAaC,IAAIZ,iCACLoB,IAAIpB,SAAUiC,OAIzBjC,YAAYnB,eACdA,aAAamB,UAAY0B,gBAAES,WAAW5B,QAAQ0B,OAAO7B"}
\ No newline at end of file
+{"version":3,"file":"str.min.js","sources":["../src/str.js"],"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 * Fetch and return language strings.\n *\n * @module     core/str\n * @copyright  2015 Damyon Wiese <damyon@moodle.com>\n * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later\n * @since      2.9\n *\n */\nimport $ from 'jquery';\nimport Ajax from 'core/ajax';\nimport Config from 'core/config';\nimport LocalStorage from 'core/localstorage';\n\n/**\n * @typedef StringRequest\n * @type {object}\n * @param {string} requests.key The string identifer to fetch\n * @param {string} [requests.component='core'] The componet to fetch from\n * @param {string} [requests.lang] The language to fetch a string for. Defaults to current page language.\n * @param {object|string} [requests.param] The param for variable expansion in the string.\n */\n\n// Module cache for the promises so that we don't make multiple\n// unnecessary requests.\nlet promiseCache = [];\n\n/* eslint-disable no-restricted-properties */\n\n/**\n * Return a Promise that resolves to a string.\n *\n * If the string has previously been cached, then the Promise will be resolved immediately, otherwise it will be fetched\n * from the server and resolved when available.\n *\n * @param {string} key The language string key\n * @param {string} component The language string component\n * @param {string} param The param for variable expansion in the string.\n * @param {string} lang The users language - if not passed it is deduced.\n * @return {jQuery.Promise} A jQuery Promise containing the translated string\n *\n * @example <caption>Fetching a string</caption>\n *\n * import {getString} from 'core/str';\n * get_string('cannotfindteacher', 'error')\n * .then((str) => window.console.log(str)); // Cannot find teacher\n */\n// eslint-disable-next-line camelcase\nexport const get_string = (key, component, param, lang) => {\n    return get_strings([{key, component, param, lang}])\n        .then(results => results[0]);\n};\n\n/**\n * Return a Promise that resolves to a string.\n *\n * If the string has previously been cached, then the Promise will be resolved immediately, otherwise it will be fetched\n * from the server and resolved when available.\n *\n * @param {string} key The language string key\n * @param {string} component The language string component\n * @param {string} param The param for variable expansion in the string.\n * @param {string} lang The users language - if not passed it is deduced.\n * @return {Promise} A native Promise containing the translated string\n *\n * @example <caption>Fetching a string</caption>\n *\n * import {getString} from 'core/str';\n *\n * getString('cannotfindteacher', 'error')\n * .then((str) => window.console.log(str)); // Cannot find teacher\n */\nexport const getString = (key, component, param, lang) => getRequestedStrings([{key, component, param, lang}])[0];\n\n// eslint-disable-next-line camelcase\n/**\n * Make a batch request to load a set of strings.\n *\n * Any missing string will be fetched from the server.\n * The Promise will only be resolved once all strings are available, or an attempt has been made to fetch them.\n *\n * @param {Array.<StringRequest>} requests List of strings to fetch\n * @return {Promise[]} An array of native promises containing the translated strings\n *\n * @example <caption>Fetching a set of strings</caption>\n *\n * import {getStrings} from 'core/str';\n * getStrings([\n *     {\n *         key: 'cannotfindteacher',\n *         component: 'error',\n *     },\n *     {\n *         key: 'yes',\n *         component: 'core',\n *     },\n *     {\n *         key: 'no',\n *         component: 'core',\n *     },\n * ])\n * .then((cannotFindTeacher, yes, no) => {\n *     window.console.log(cannotFindTeacher); // Cannot find teacher\n *     window.console.log(yes); // Yes\n *     window.console.log(no); // No\n * });\n */\nexport const getStrings = (requests) => Promise.all(getRequestedStrings(requests));\n\n/**\n * Internal function to perform the string requests.\n *\n * @param {Array.<StringRequest>} requests List of strings to fetch\n * @returns {Promise<string>}\n */\nconst getRequestedStrings = (requests) => {\n    let requestData = [];\n    const pageLang = Config.language;\n\n    // Helper function to construct the cache key.\n    const getCacheKey = ({key, component, lang = pageLang}) => `core_str/${key}/${component}/${lang}`;\n\n    const stringPromises = requests.map((request) => {\n        let {component, key, param, lang = pageLang} = request;\n        if (!component) {\n            component = 'core';\n        }\n\n        const cacheKey = getCacheKey({key, component, lang});\n\n        // Helper function to add the promise to cache.\n        const buildReturn = (promise) => {\n            // Make sure the promise cache contains our promise.\n            promiseCache[cacheKey] = promise;\n            return promise;\n        };\n\n        // Check if we can serve the string straight from M.str.\n        if (component in M.str && key in M.str[component]) {\n            return buildReturn(new Promise((resolve) => {\n                resolve(M.util.get_string(key, component, param, lang));\n            }));\n        }\n\n        // Check if the string is in the browser's local storage.\n        const cached = LocalStorage.get(cacheKey);\n        if (cached) {\n            M.str[component] = {...M.str[component], [key]: cached};\n            return buildReturn(new Promise((resolve) => {\n                resolve(M.util.get_string(key, component, param, lang));\n            }));\n        }\n\n        // Check if we've already loaded this string from the server.\n        if (cacheKey in promiseCache) {\n            return buildReturn(promiseCache[cacheKey]).then(() => {\n                return M.util.get_string(key, component, param, lang);\n            });\n        } else {\n            // We're going to have to ask the server for the string so\n            // add this string to the list of requests to be sent.\n            return buildReturn(new Promise((resolve, reject) => {\n                requestData.push({\n                    methodname: 'core_get_string',\n                    args: {\n                        stringid: key,\n                        stringparams: [],\n                        component,\n                        lang,\n                    },\n                    done: (str) => {\n                        // When we get the response from the server\n                        // we should update M.str and the browser's\n                        // local storage before resolving this promise.\n                        M.str[component] = {...M.str[component], [key]: str};\n                        LocalStorage.set(cacheKey, str);\n                        resolve(M.util.get_string(key, component, param, lang));\n                    },\n                    fail: reject\n                });\n            }));\n        }\n    });\n\n    if (requestData.length) {\n        // If we need to load any strings from the server then send\n        // off the request.\n        Ajax.call(requestData, true, false, false, 0, M.cfg.langrev);\n    }\n\n    return stringPromises;\n};\n\n/**\n * Make a batch request to load a set of strings.\n *\n * Any missing string will be fetched from the server.\n * The Promise will only be resolved once all strings are available, or an attempt has been made to fetch them.\n *\n * @param {Array.<StringRequest>} requests List of strings to fetch\n * @return {Promise[]} An array of native promises containing the translated strings\n *\n * @example <caption>Fetching a set of strings</caption>\n *\n * import {getStrings} from 'core/str';\n * get_strings([\n *     {\n *         key: 'cannotfindteacher',\n *         component: 'error',\n *     },\n *     {\n *         key: 'yes',\n *         component: 'core',\n *     },\n *     {\n *         key: 'no',\n *         component: 'core',\n *     },\n * ])\n * .then((cannotFindTeacher, yes, no) => {\n *     window.console.log(cannotFindTeacher); // Cannot find teacher\n *     window.console.log(yes); // Yes\n *     window.console.log(no); // No\n * });\n */\n// eslint-disable-next-line camelcase\nexport const get_strings = (requests) => {\n    // We need to use jQuery here because some calling code uses the\n    // .done handler instead of the .then handler.\n    return $.when.apply($, getRequestedStrings(requests))\n        .then((...strings) => strings);\n};\n\n/**\n * Add a list of strings to the caches.\n *\n * This function should typically only be called from core APIs to pre-cache values.\n *\n * @method cache_strings\n * @protected\n * @param {Object[]} strings List of strings to fetch\n * @param {string} strings.key The string identifer to fetch\n * @param {string} strings.value The string value\n * @param {string} [strings.component='core'] The componet to fetch from\n * @param {string} [strings.lang=Config.language] The language to fetch a string for. Defaults to current page language.\n */\n// eslint-disable-next-line camelcase\nexport const cache_strings = (strings) => {\n    strings.forEach(({key, component, value, lang = Config.language}) => {\n        const cacheKey = ['core_str', key, component, lang].join('/');\n\n        // Check M.str caching.\n        if (!(component in M.str) || !(key in M.str[component])) {\n            if (!(component in M.str)) {\n                M.str[component] = {};\n            }\n\n            M.str[component][key] = value;\n        }\n\n        // Check local storage.\n        if (!LocalStorage.get(cacheKey)) {\n            LocalStorage.set(cacheKey, value);\n        }\n\n        // Check the promises cache.\n        if (!(cacheKey in promiseCache)) {\n            promiseCache[cacheKey] = $.Deferred().resolve(value).promise();\n        }\n    });\n};\n/* eslint-enable no-restricted-properties */\n"],"names":["promiseCache","key","component","param","lang","get_strings","then","results","getRequestedStrings","requests","Promise","all","requestData","pageLang","Config","language","stringPromises","map","request","cacheKey","_ref","getCacheKey","buildReturn","promise","M","str","resolve","util","get_string","cached","LocalStorage","get","reject","push","methodname","args","stringid","stringparams","done","set","fail","length","call","cfg","langrev","$","when","apply","strings","forEach","_ref2","value","join","Deferred"],"mappings":";;;;;;;;;uVAwCIA,aAAe,uBAuBO,CAACC,IAAKC,UAAWC,MAAOC,OACvCC,YAAY,CAAC,CAACJ,IAAAA,IAAKC,UAAAA,UAAWC,MAAAA,MAAOC,KAAAA,QACvCE,MAAKC,SAAWA,QAAQ,wBAsBR,CAACN,IAAKC,UAAWC,MAAOC,OAASI,oBAAoB,CAAC,CAACP,IAAAA,IAAKC,UAAAA,UAAWC,MAAAA,MAAOC,KAAAA,QAAQ,uBAmCpFK,UAAaC,QAAQC,IAAIH,oBAAoBC,iBAQlED,oBAAuBC,eACrBG,YAAc,SACZC,SAAWC,gBAAOC,SAKlBC,eAAiBP,SAASQ,KAAKC,cAC7BhB,UAACA,UAADD,IAAYA,IAAZE,MAAiBA,MAAjBC,KAAwBA,KAAOS,UAAYK,QAC1ChB,YACDA,UAAY,cAGViB,SARUC,CAAAA,WAACnB,IAACA,IAADC,UAAMA,UAANE,KAAiBA,KAAOS,wCAA0BZ,gBAAOC,sBAAaE,OAQtEiB,CAAY,CAACpB,IAAAA,IAAKC,UAAAA,UAAWE,KAAAA,OAGxCkB,YAAeC,UAEjBvB,aAAamB,UAAYI,QAClBA,YAIPrB,aAAasB,EAAEC,KAAOxB,OAAOuB,EAAEC,IAAIvB,kBAC5BoB,YAAY,IAAIZ,SAASgB,UAC5BA,QAAQF,EAAEG,KAAKC,WAAW3B,IAAKC,UAAWC,MAAOC,iBAKnDyB,OAASC,sBAAaC,IAAIZ,iBAC5BU,QACAL,EAAEC,IAAIvB,WAAa,IAAIsB,EAAEC,IAAIvB,YAAaD,KAAM4B,QACzCP,YAAY,IAAIZ,SAASgB,UAC5BA,QAAQF,EAAEG,KAAKC,WAAW3B,IAAKC,UAAWC,MAAOC,YAKrDe,YAAYnB,aACLsB,YAAYtB,aAAamB,WAAWb,MAAK,IACrCkB,EAAEG,KAAKC,WAAW3B,IAAKC,UAAWC,MAAOC,QAK7CkB,YAAY,IAAIZ,SAAQ,CAACgB,QAASM,UACrCpB,YAAYqB,KAAK,CACbC,WAAY,kBACZC,KAAM,CACFC,SAAUnC,IACVoC,aAAc,GACdnC,UAAAA,UACAE,KAAAA,MAEJkC,KAAOb,MAIHD,EAAEC,IAAIvB,WAAa,IAAIsB,EAAEC,IAAIvB,YAAaD,KAAMwB,2BACnCc,IAAIpB,SAAUM,KAC3BC,QAAQF,EAAEG,KAAKC,WAAW3B,IAAKC,UAAWC,MAAOC,QAErDoC,KAAMR,uBAMlBpB,YAAY6B,sBAGPC,KAAK9B,aAAa,GAAM,GAAO,EAAO,EAAGY,EAAEmB,IAAIC,SAGjD5B,gBAoCEX,YAAeI,UAGjBoC,gBAAEC,KAAKC,MAAMF,gBAAGrC,oBAAoBC,WACtCH,MAAK,yCAAI0C,gDAAAA,qCAAYA,mEAiBAA,UAC1BA,QAAQC,SAAQC,YAACjD,IAACA,IAADC,UAAMA,UAANiD,MAAiBA,MAAjB/C,KAAwBA,KAAOU,gBAAOC,sBAC7CI,SAAW,CAAC,WAAYlB,IAAKC,UAAWE,MAAMgD,KAAK,KAGnDlD,aAAasB,EAAEC,KAAUxB,OAAOuB,EAAEC,IAAIvB,aAClCA,aAAasB,EAAEC,MACjBD,EAAEC,IAAIvB,WAAa,IAGvBsB,EAAEC,IAAIvB,WAAWD,KAAOkD,OAIvBrB,sBAAaC,IAAIZ,iCACLoB,IAAIpB,SAAUgC,OAIzBhC,YAAYnB,eACdA,aAAamB,UAAY0B,gBAAEQ,WAAW3B,QAAQyB,OAAO5B"}
\ No newline at end of file
diff --git a/lib/amd/build/user_date.min.js b/lib/amd/build/user_date.min.js
index 64ffc12a844..637896740e5 100644
--- a/lib/amd/build/user_date.min.js
+++ b/lib/amd/build/user_date.min.js
@@ -5,6 +5,6 @@
  * @copyright  2017 Ryan Wyllie <ryan@moodle.com>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-define("core/user_date",["jquery","core/ajax","core/sessionstorage","core/config"],(function($,Ajax,Storage,Config){var promisesCache={},getKey=function(request){return"core_user_date/"+$("html").attr("lang").replace(/-/g,"_")+"/"+Config.usertimezone+"/"+request.timestamp+"/"+request.format},loadDatesFromServer=function(dates){var args=dates.map((function(data){var fixDay=data.hasOwnProperty("fixday")?data.fixday:1,fixHour=data.hasOwnProperty("fixhour")?data.fixhour:1;return{timestamp:data.timestamp,format:data.format,type:data.type||null,fixday:fixDay,fixhour:fixHour}})),request={methodname:"core_get_user_dates",args:{contextid:Config.contextid,timestamps:args}};return Ajax.call([request],!0,!0)[0].then((function(results){results.dates.forEach((function(value,index){var date=dates[index];!function(key,value){Storage.set(key,value)}(getKey(date),value),date.deferred.resolve(value)}))})).catch((function(ex){dates.forEach((function(date){date.deferred.reject(ex)}))}))};return{get:function(requests){var ajaxRequests=[],promises=[];return requests.forEach((function(request){var key=getKey(request);if(function(key){return void 0!==promisesCache[key]}(key))promises.push(function(key){return promisesCache[key]}(key));else{var deferred=$.Deferred(),cached=function(key){return Storage.get(key)}(key);cached?deferred.resolve(cached):(request.deferred=deferred,ajaxRequests.push(request)),function(key,promise){promisesCache[key]=promise}(key,deferred.promise()),promises.push(deferred.promise())}})),ajaxRequests.length&&loadDatesFromServer(ajaxRequests),$.when.apply($,promises).then((function(){return 1===arguments.length?[arguments[0]]:Array.apply(null,arguments)}))},getUserMidnightForTimestamp:function(timestamp,todayMidnight){var future=timestamp>todayMidnight,diffSeconds=Math.abs(timestamp-todayMidnight),diffDaysInSeconds=86400*(future?Math.floor(diffSeconds/86400):Math.ceil(diffSeconds/86400));return future?todayMidnight+diffDaysInSeconds:todayMidnight-diffDaysInSeconds}}}));
+define("core/user_date",["jquery","core/ajax","core/sessionstorage","core/config"],(function($,Ajax,Storage,Config){var promisesCache={},getKey=function(request){return"core_user_date/"+Config.language+"/"+Config.usertimezone+"/"+request.timestamp+"/"+request.format},loadDatesFromServer=function(dates){var args=dates.map((function(data){var fixDay=data.hasOwnProperty("fixday")?data.fixday:1,fixHour=data.hasOwnProperty("fixhour")?data.fixhour:1;return{timestamp:data.timestamp,format:data.format,type:data.type||null,fixday:fixDay,fixhour:fixHour}})),request={methodname:"core_get_user_dates",args:{contextid:Config.contextid,timestamps:args}};return Ajax.call([request],!0,!0)[0].then((function(results){results.dates.forEach((function(value,index){var date=dates[index];!function(key,value){Storage.set(key,value)}(getKey(date),value),date.deferred.resolve(value)}))})).catch((function(ex){dates.forEach((function(date){date.deferred.reject(ex)}))}))};return{get:function(requests){var ajaxRequests=[],promises=[];return requests.forEach((function(request){var key=getKey(request);if(function(key){return void 0!==promisesCache[key]}(key))promises.push(function(key){return promisesCache[key]}(key));else{var deferred=$.Deferred(),cached=function(key){return Storage.get(key)}(key);cached?deferred.resolve(cached):(request.deferred=deferred,ajaxRequests.push(request)),function(key,promise){promisesCache[key]=promise}(key,deferred.promise()),promises.push(deferred.promise())}})),ajaxRequests.length&&loadDatesFromServer(ajaxRequests),$.when.apply($,promises).then((function(){return 1===arguments.length?[arguments[0]]:Array.apply(null,arguments)}))},getUserMidnightForTimestamp:function(timestamp,todayMidnight){var future=timestamp>todayMidnight,diffSeconds=Math.abs(timestamp-todayMidnight),diffDaysInSeconds=86400*(future?Math.floor(diffSeconds/86400):Math.ceil(diffSeconds/86400));return future?todayMidnight+diffDaysInSeconds:todayMidnight-diffDaysInSeconds}}}));
 
 //# sourceMappingURL=user_date.min.js.map
\ No newline at end of file
diff --git a/lib/amd/build/user_date.min.js.map b/lib/amd/build/user_date.min.js.map
index 12b266f68e5..9bae1aaaed2 100644
--- a/lib/amd/build/user_date.min.js.map
+++ b/lib/amd/build/user_date.min.js.map
@@ -1 +1 @@
-{"version":3,"file":"user_date.min.js","sources":["../src/user_date.js"],"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 * Fetch and render dates from timestamps.\n *\n * @module     core/user_date\n * @copyright  2017 Ryan Wyllie <ryan@moodle.com>\n * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later\n */\ndefine(['jquery', 'core/ajax', 'core/sessionstorage', 'core/config'],\n        function($, Ajax, Storage, Config) {\n\n    var SECONDS_IN_DAY = 86400;\n\n    /** @var {object} promisesCache Store all promises we've seen so far. */\n    var promisesCache = {};\n\n    /**\n     * Generate a cache key for the given request. The request should\n     * have a timestamp and format key.\n     *\n     * @param {object} request\n     * @return {string}\n     */\n    var getKey = function(request) {\n        var language = $('html').attr('lang').replace(/-/g, '_');\n        return 'core_user_date/' +\n               language + '/' +\n               Config.usertimezone + '/' +\n               request.timestamp + '/' +\n               request.format;\n    };\n\n    /**\n     * Retrieve a transformed date from the browser's storage.\n     *\n     * @param {string} key\n     * @return {string}\n     */\n    var getFromLocalStorage = function(key) {\n        return Storage.get(key);\n    };\n\n    /**\n     * Save the transformed date in the browser's storage.\n     *\n     * @param {string} key\n     * @param {string} value\n     */\n    var addToLocalStorage = function(key, value) {\n        Storage.set(key, value);\n    };\n\n    /**\n     * Check if a key is in the module's cache.\n     *\n     * @param {string} key\n     * @return {bool}\n     */\n    var inPromisesCache = function(key) {\n        return (typeof promisesCache[key] !== 'undefined');\n    };\n\n    /**\n     * Retrieve a promise from the module's cache.\n     *\n     * @param {string} key\n     * @return {object} jQuery promise\n     */\n    var getFromPromisesCache = function(key) {\n        return promisesCache[key];\n    };\n\n    /**\n     * Save the given promise in the module's cache.\n     *\n     * @param {string} key\n     * @param {object} promise\n     */\n    var addToPromisesCache = function(key, promise) {\n        promisesCache[key] = promise;\n    };\n\n    /**\n     * Send a request to the server for each of the required timestamp\n     * and format combinations.\n     *\n     * Resolves the date's deferred with the values returned from the\n     * server and saves the value in local storage.\n     *\n     * @param {array} dates\n     * @return {object} jQuery promise\n     */\n    var loadDatesFromServer = function(dates) {\n        var args = dates.map(function(data) {\n            var fixDay = data.hasOwnProperty('fixday') ? data.fixday : 1;\n            var fixHour = data.hasOwnProperty('fixhour') ? data.fixhour : 1;\n            return {\n                timestamp: data.timestamp,\n                format: data.format,\n                type: data.type || null,\n                fixday: fixDay,\n                fixhour: fixHour\n            };\n        });\n\n        var request = {\n            methodname: 'core_get_user_dates',\n            args: {\n                contextid: Config.contextid,\n                timestamps: args\n            }\n        };\n\n        return Ajax.call([request], true, true)[0].then(function(results) {\n            results.dates.forEach(function(value, index) {\n                var date = dates[index];\n                var key = getKey(date);\n\n                addToLocalStorage(key, value);\n                date.deferred.resolve(value);\n            });\n            return;\n        })\n        .catch(function(ex) {\n            // If we failed to retrieve the dates then reject the date's\n            // deferred objects to make sure they don't hang.\n            dates.forEach(function(date) {\n                date.deferred.reject(ex);\n            });\n        });\n    };\n\n    /**\n     * Takes an array of request objects and returns a promise that\n     * is resolved with an array of formatted dates.\n     *\n     * The values in the returned array will be ordered the same as\n     * the request array.\n     *\n     * This function will check both the module's static promises cache\n     * and the browser's session storage to see if the user dates have\n     * already been loaded in order to avoid sending a network request\n     * if possible.\n     *\n     * Only dates not found in either cache will be sent to the server\n     * for transforming.\n     *\n     * A request object must have a timestamp key and a format key and\n     * optionally may have a type key.\n     *\n     * E.g.\n     * var request = [\n     *     {\n     *         timestamp: 1293876000,\n     *         format: '%d %B %Y'\n     *     },\n     *     {\n     *         timestamp: 1293876000,\n     *         format: '%A, %d %B %Y, %I:%M %p',\n     *         type: 'gregorian',\n     *         fixday: false,\n     *         fixhour: false\n     *     }\n     * ];\n     *\n     * UserDate.get(request).done(function(dates) {\n     *     console.log(dates[0]); // prints \"1 January 2011\".\n     *     console.log(dates[1]); // prints \"Saturday, 1 January 2011, 10:00 AM\".\n     * });\n     *\n     * @param {array} requests\n     * @return {object} jQuery promise\n     */\n    var get = function(requests) {\n        var ajaxRequests = [];\n        var promises = [];\n\n        // Loop over each of the requested timestamp/format combos\n        // and add a promise to the promises array for them.\n        requests.forEach(function(request) {\n            var key = getKey(request);\n\n            // If we've already got a promise then use it.\n            if (inPromisesCache(key)) {\n                promises.push(getFromPromisesCache(key));\n            } else {\n                var deferred = $.Deferred();\n                var cached = getFromLocalStorage(key);\n\n                if (cached) {\n                    // If we were able to get the value from session storage\n                    // then we can resolve the deferred with that value. No\n                    // need to ask the server to transform it for us.\n                    deferred.resolve(cached);\n                } else {\n                    // Add this request to the list of ones we need to load\n                    // from the server. Include the deferred so that it can\n                    // be resolved when the server has responded with the\n                    // transformed values.\n                    request.deferred = deferred;\n                    ajaxRequests.push(request);\n                }\n\n                // Remember this promise for next time so that we can\n                // bail out early if it is requested again.\n                addToPromisesCache(key, deferred.promise());\n                promises.push(deferred.promise());\n            }\n        });\n\n        // If we have any requests that we couldn't resolve from the caches\n        // then let's ask the server to get them for us.\n        if (ajaxRequests.length) {\n            loadDatesFromServer(ajaxRequests);\n        }\n\n        // Wait for all of the promises to resolve. Some of them may be waiting\n        // for a response from the server.\n        return $.when.apply($, promises).then(function() {\n            // This looks complicated but it's just converting an unknown\n            // length of arguments into an array for the promise to resolve\n            // with.\n            return arguments.length === 1 ? [arguments[0]] : Array.apply(null, arguments);\n        });\n    };\n\n\n    /**\n     * For a given timestamp get the midnight value in the user's timezone.\n     *\n     * The calculation is performed relative to the user's midnight timestamp\n     * for today to ensure that timezones are preserved.\n     *\n     * E.g.\n     * Input:\n     * timestamp: 1514836800 (01/01/2018 8pm GMT)(02/01/2018 4am GMT+8)\n     * midnight: 1514851200 (02/01/2018 midnight GMT)\n     * Output:\n     * 1514764800 (01/01/2018 midnight GMT)\n     *\n     * Input:\n     * timestamp: 1514836800 (01/01/2018 8pm GMT)(02/01/2018 4am GMT+8)\n     * midnight: 1514822400 (02/01/2018 midnight GMT+8)\n     * Output:\n     * 1514822400 (02/01/2018 midnight GMT+8)\n     *\n     * @param {Number} timestamp The timestamp to calculate from\n     * @param {Number} todayMidnight The user's midnight timestamp\n     * @return {Number} The midnight value of the user's timestamp\n     */\n    var getUserMidnightForTimestamp = function(timestamp, todayMidnight) {\n        var future = timestamp > todayMidnight;\n        var diffSeconds = Math.abs(timestamp - todayMidnight);\n        var diffDays = future ? Math.floor(diffSeconds / SECONDS_IN_DAY) : Math.ceil(diffSeconds / SECONDS_IN_DAY);\n        var diffDaysInSeconds = diffDays * SECONDS_IN_DAY;\n        // Is the timestamp in the future or past?\n        var dayTimestamp = future ? todayMidnight + diffDaysInSeconds : todayMidnight - diffDaysInSeconds;\n        return dayTimestamp;\n    };\n\n    return {\n        get: get,\n        getUserMidnightForTimestamp: getUserMidnightForTimestamp\n    };\n});\n"],"names":["define","$","Ajax","Storage","Config","promisesCache","getKey","request","attr","replace","usertimezone","timestamp","format","loadDatesFromServer","dates","args","map","data","fixDay","hasOwnProperty","fixday","fixHour","fixhour","type","methodname","contextid","timestamps","call","then","results","forEach","value","index","date","key","set","addToLocalStorage","deferred","resolve","catch","ex","reject","get","requests","ajaxRequests","promises","inPromisesCache","push","getFromPromisesCache","Deferred","cached","getFromLocalStorage","promise","addToPromisesCache","length","when","apply","arguments","Array","getUserMidnightForTimestamp","todayMidnight","future","diffSeconds","Math","abs","diffDaysInSeconds","floor","ceil"],"mappings":";;;;;;;AAsBAA,wBAAO,CAAC,SAAU,YAAa,sBAAuB,gBAC9C,SAASC,EAAGC,KAAMC,QAASC,YAK3BC,cAAgB,GAShBC,OAAS,SAASC,eAEX,kBADQN,EAAE,QAAQO,KAAK,QAAQC,QAAQ,KAAM,KAElC,IACXL,OAAOM,aAAe,IACtBH,QAAQI,UAAY,IACpBJ,QAAQK,QA+DfC,oBAAsB,SAASC,WAC3BC,KAAOD,MAAME,KAAI,SAASC,UACtBC,OAASD,KAAKE,eAAe,UAAYF,KAAKG,OAAS,EACvDC,QAAUJ,KAAKE,eAAe,WAAaF,KAAKK,QAAU,QACvD,CACHX,UAAWM,KAAKN,UAChBC,OAAQK,KAAKL,OACbW,KAAMN,KAAKM,MAAQ,KACnBH,OAAQF,OACRI,QAASD,YAIbd,QAAU,CACViB,WAAY,sBACZT,KAAM,CACFU,UAAWrB,OAAOqB,UAClBC,WAAYX,cAIbb,KAAKyB,KAAK,CAACpB,UAAU,GAAM,GAAM,GAAGqB,MAAK,SAASC,SACrDA,QAAQf,MAAMgB,SAAQ,SAASC,MAAOC,WAC9BC,KAAOnB,MAAMkB,QAnEL,SAASE,IAAKH,OAClC5B,QAAQgC,IAAID,IAAKH,OAqETK,CAFU9B,OAAO2B,MAEMF,OACvBE,KAAKI,SAASC,QAAQP,aAI7BQ,OAAM,SAASC,IAGZ1B,MAAMgB,SAAQ,SAASG,MACnBA,KAAKI,SAASI,OAAOD,iBAqI1B,CACHE,IAxFM,SAASC,cACXC,aAAe,GACfC,SAAW,UAIfF,SAASb,SAAQ,SAASvB,aAClB2B,IAAM5B,OAAOC,YA1HH,SAAS2B,iBACW,IAAvB7B,cAAc6B,KA4HrBY,CAAgBZ,KAChBW,SAASE,KApHM,SAASb,YACzB7B,cAAc6B,KAmHCc,CAAqBd,UAChC,KACCG,SAAWpC,EAAEgD,WACbC,OArJU,SAAShB,YACxB/B,QAAQuC,IAAIR,KAoJEiB,CAAoBjB,KAE7BgB,OAIAb,SAASC,QAAQY,SAMjB3C,QAAQ8B,SAAWA,SACnBO,aAAaG,KAAKxC,UA1HT,SAAS2B,IAAKkB,SACnC/C,cAAc6B,KAAOkB,QA8HbC,CAAmBnB,IAAKG,SAASe,WACjCP,SAASE,KAAKV,SAASe,eAM3BR,aAAaU,QACbzC,oBAAoB+B,cAKjB3C,EAAEsD,KAAKC,MAAMvD,EAAG4C,UAAUjB,MAAK,kBAIN,IAArB6B,UAAUH,OAAe,CAACG,UAAU,IAAMC,MAAMF,MAAM,KAAMC,eAwCvEE,4BAZ8B,SAAShD,UAAWiD,mBAC9CC,OAASlD,UAAYiD,cACrBE,YAAcC,KAAKC,IAAIrD,UAAYiD,eAEnCK,kBAnPa,OAkPFJ,OAASE,KAAKG,MAAMJ,YAlPlB,OAkPkDC,KAAKI,KAAKL,YAlP5D,eAqPED,OAASD,cAAgBK,kBAAoBL,cAAgBK"}
\ No newline at end of file
+{"version":3,"file":"user_date.min.js","sources":["../src/user_date.js"],"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 * Fetch and render dates from timestamps.\n *\n * @module     core/user_date\n * @copyright  2017 Ryan Wyllie <ryan@moodle.com>\n * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later\n */\ndefine(['jquery', 'core/ajax', 'core/sessionstorage', 'core/config'],\n        function($, Ajax, Storage, Config) {\n\n    var SECONDS_IN_DAY = 86400;\n\n    /** @var {object} promisesCache Store all promises we've seen so far. */\n    var promisesCache = {};\n\n    /**\n     * Generate a cache key for the given request. The request should\n     * have a timestamp and format key.\n     *\n     * @param {object} request\n     * @return {string}\n     */\n    var getKey = function(request) {\n        return 'core_user_date/' +\n               Config.language + '/' +\n               Config.usertimezone + '/' +\n               request.timestamp + '/' +\n               request.format;\n    };\n\n    /**\n     * Retrieve a transformed date from the browser's storage.\n     *\n     * @param {string} key\n     * @return {string}\n     */\n    var getFromLocalStorage = function(key) {\n        return Storage.get(key);\n    };\n\n    /**\n     * Save the transformed date in the browser's storage.\n     *\n     * @param {string} key\n     * @param {string} value\n     */\n    var addToLocalStorage = function(key, value) {\n        Storage.set(key, value);\n    };\n\n    /**\n     * Check if a key is in the module's cache.\n     *\n     * @param {string} key\n     * @return {bool}\n     */\n    var inPromisesCache = function(key) {\n        return (typeof promisesCache[key] !== 'undefined');\n    };\n\n    /**\n     * Retrieve a promise from the module's cache.\n     *\n     * @param {string} key\n     * @return {object} jQuery promise\n     */\n    var getFromPromisesCache = function(key) {\n        return promisesCache[key];\n    };\n\n    /**\n     * Save the given promise in the module's cache.\n     *\n     * @param {string} key\n     * @param {object} promise\n     */\n    var addToPromisesCache = function(key, promise) {\n        promisesCache[key] = promise;\n    };\n\n    /**\n     * Send a request to the server for each of the required timestamp\n     * and format combinations.\n     *\n     * Resolves the date's deferred with the values returned from the\n     * server and saves the value in local storage.\n     *\n     * @param {array} dates\n     * @return {object} jQuery promise\n     */\n    var loadDatesFromServer = function(dates) {\n        var args = dates.map(function(data) {\n            var fixDay = data.hasOwnProperty('fixday') ? data.fixday : 1;\n            var fixHour = data.hasOwnProperty('fixhour') ? data.fixhour : 1;\n            return {\n                timestamp: data.timestamp,\n                format: data.format,\n                type: data.type || null,\n                fixday: fixDay,\n                fixhour: fixHour\n            };\n        });\n\n        var request = {\n            methodname: 'core_get_user_dates',\n            args: {\n                contextid: Config.contextid,\n                timestamps: args\n            }\n        };\n\n        return Ajax.call([request], true, true)[0].then(function(results) {\n            results.dates.forEach(function(value, index) {\n                var date = dates[index];\n                var key = getKey(date);\n\n                addToLocalStorage(key, value);\n                date.deferred.resolve(value);\n            });\n            return;\n        })\n        .catch(function(ex) {\n            // If we failed to retrieve the dates then reject the date's\n            // deferred objects to make sure they don't hang.\n            dates.forEach(function(date) {\n                date.deferred.reject(ex);\n            });\n        });\n    };\n\n    /**\n     * Takes an array of request objects and returns a promise that\n     * is resolved with an array of formatted dates.\n     *\n     * The values in the returned array will be ordered the same as\n     * the request array.\n     *\n     * This function will check both the module's static promises cache\n     * and the browser's session storage to see if the user dates have\n     * already been loaded in order to avoid sending a network request\n     * if possible.\n     *\n     * Only dates not found in either cache will be sent to the server\n     * for transforming.\n     *\n     * A request object must have a timestamp key and a format key and\n     * optionally may have a type key.\n     *\n     * E.g.\n     * var request = [\n     *     {\n     *         timestamp: 1293876000,\n     *         format: '%d %B %Y'\n     *     },\n     *     {\n     *         timestamp: 1293876000,\n     *         format: '%A, %d %B %Y, %I:%M %p',\n     *         type: 'gregorian',\n     *         fixday: false,\n     *         fixhour: false\n     *     }\n     * ];\n     *\n     * UserDate.get(request).done(function(dates) {\n     *     console.log(dates[0]); // prints \"1 January 2011\".\n     *     console.log(dates[1]); // prints \"Saturday, 1 January 2011, 10:00 AM\".\n     * });\n     *\n     * @param {array} requests\n     * @return {object} jQuery promise\n     */\n    var get = function(requests) {\n        var ajaxRequests = [];\n        var promises = [];\n\n        // Loop over each of the requested timestamp/format combos\n        // and add a promise to the promises array for them.\n        requests.forEach(function(request) {\n            var key = getKey(request);\n\n            // If we've already got a promise then use it.\n            if (inPromisesCache(key)) {\n                promises.push(getFromPromisesCache(key));\n            } else {\n                var deferred = $.Deferred();\n                var cached = getFromLocalStorage(key);\n\n                if (cached) {\n                    // If we were able to get the value from session storage\n                    // then we can resolve the deferred with that value. No\n                    // need to ask the server to transform it for us.\n                    deferred.resolve(cached);\n                } else {\n                    // Add this request to the list of ones we need to load\n                    // from the server. Include the deferred so that it can\n                    // be resolved when the server has responded with the\n                    // transformed values.\n                    request.deferred = deferred;\n                    ajaxRequests.push(request);\n                }\n\n                // Remember this promise for next time so that we can\n                // bail out early if it is requested again.\n                addToPromisesCache(key, deferred.promise());\n                promises.push(deferred.promise());\n            }\n        });\n\n        // If we have any requests that we couldn't resolve from the caches\n        // then let's ask the server to get them for us.\n        if (ajaxRequests.length) {\n            loadDatesFromServer(ajaxRequests);\n        }\n\n        // Wait for all of the promises to resolve. Some of them may be waiting\n        // for a response from the server.\n        return $.when.apply($, promises).then(function() {\n            // This looks complicated but it's just converting an unknown\n            // length of arguments into an array for the promise to resolve\n            // with.\n            return arguments.length === 1 ? [arguments[0]] : Array.apply(null, arguments);\n        });\n    };\n\n\n    /**\n     * For a given timestamp get the midnight value in the user's timezone.\n     *\n     * The calculation is performed relative to the user's midnight timestamp\n     * for today to ensure that timezones are preserved.\n     *\n     * E.g.\n     * Input:\n     * timestamp: 1514836800 (01/01/2018 8pm GMT)(02/01/2018 4am GMT+8)\n     * midnight: 1514851200 (02/01/2018 midnight GMT)\n     * Output:\n     * 1514764800 (01/01/2018 midnight GMT)\n     *\n     * Input:\n     * timestamp: 1514836800 (01/01/2018 8pm GMT)(02/01/2018 4am GMT+8)\n     * midnight: 1514822400 (02/01/2018 midnight GMT+8)\n     * Output:\n     * 1514822400 (02/01/2018 midnight GMT+8)\n     *\n     * @param {Number} timestamp The timestamp to calculate from\n     * @param {Number} todayMidnight The user's midnight timestamp\n     * @return {Number} The midnight value of the user's timestamp\n     */\n    var getUserMidnightForTimestamp = function(timestamp, todayMidnight) {\n        var future = timestamp > todayMidnight;\n        var diffSeconds = Math.abs(timestamp - todayMidnight);\n        var diffDays = future ? Math.floor(diffSeconds / SECONDS_IN_DAY) : Math.ceil(diffSeconds / SECONDS_IN_DAY);\n        var diffDaysInSeconds = diffDays * SECONDS_IN_DAY;\n        // Is the timestamp in the future or past?\n        var dayTimestamp = future ? todayMidnight + diffDaysInSeconds : todayMidnight - diffDaysInSeconds;\n        return dayTimestamp;\n    };\n\n    return {\n        get: get,\n        getUserMidnightForTimestamp: getUserMidnightForTimestamp\n    };\n});\n"],"names":["define","$","Ajax","Storage","Config","promisesCache","getKey","request","language","usertimezone","timestamp","format","loadDatesFromServer","dates","args","map","data","fixDay","hasOwnProperty","fixday","fixHour","fixhour","type","methodname","contextid","timestamps","call","then","results","forEach","value","index","date","key","set","addToLocalStorage","deferred","resolve","catch","ex","reject","get","requests","ajaxRequests","promises","inPromisesCache","push","getFromPromisesCache","Deferred","cached","getFromLocalStorage","promise","addToPromisesCache","length","when","apply","arguments","Array","getUserMidnightForTimestamp","todayMidnight","future","diffSeconds","Math","abs","diffDaysInSeconds","floor","ceil"],"mappings":";;;;;;;AAsBAA,wBAAO,CAAC,SAAU,YAAa,sBAAuB,gBAC9C,SAASC,EAAGC,KAAMC,QAASC,YAK3BC,cAAgB,GAShBC,OAAS,SAASC,eACX,kBACAH,OAAOI,SAAW,IAClBJ,OAAOK,aAAe,IACtBF,QAAQG,UAAY,IACpBH,QAAQI,QA+DfC,oBAAsB,SAASC,WAC3BC,KAAOD,MAAME,KAAI,SAASC,UACtBC,OAASD,KAAKE,eAAe,UAAYF,KAAKG,OAAS,EACvDC,QAAUJ,KAAKE,eAAe,WAAaF,KAAKK,QAAU,QACvD,CACHX,UAAWM,KAAKN,UAChBC,OAAQK,KAAKL,OACbW,KAAMN,KAAKM,MAAQ,KACnBH,OAAQF,OACRI,QAASD,YAIbb,QAAU,CACVgB,WAAY,sBACZT,KAAM,CACFU,UAAWpB,OAAOoB,UAClBC,WAAYX,cAIbZ,KAAKwB,KAAK,CAACnB,UAAU,GAAM,GAAM,GAAGoB,MAAK,SAASC,SACrDA,QAAQf,MAAMgB,SAAQ,SAASC,MAAOC,WAC9BC,KAAOnB,MAAMkB,QAnEL,SAASE,IAAKH,OAClC3B,QAAQ+B,IAAID,IAAKH,OAqETK,CAFU7B,OAAO0B,MAEMF,OACvBE,KAAKI,SAASC,QAAQP,aAI7BQ,OAAM,SAASC,IAGZ1B,MAAMgB,SAAQ,SAASG,MACnBA,KAAKI,SAASI,OAAOD,iBAqI1B,CACHE,IAxFM,SAASC,cACXC,aAAe,GACfC,SAAW,UAIfF,SAASb,SAAQ,SAAStB,aAClB0B,IAAM3B,OAAOC,YA1HH,SAAS0B,iBACW,IAAvB5B,cAAc4B,KA4HrBY,CAAgBZ,KAChBW,SAASE,KApHM,SAASb,YACzB5B,cAAc4B,KAmHCc,CAAqBd,UAChC,KACCG,SAAWnC,EAAE+C,WACbC,OArJU,SAAShB,YACxB9B,QAAQsC,IAAIR,KAoJEiB,CAAoBjB,KAE7BgB,OAIAb,SAASC,QAAQY,SAMjB1C,QAAQ6B,SAAWA,SACnBO,aAAaG,KAAKvC,UA1HT,SAAS0B,IAAKkB,SACnC9C,cAAc4B,KAAOkB,QA8HbC,CAAmBnB,IAAKG,SAASe,WACjCP,SAASE,KAAKV,SAASe,eAM3BR,aAAaU,QACbzC,oBAAoB+B,cAKjB1C,EAAEqD,KAAKC,MAAMtD,EAAG2C,UAAUjB,MAAK,kBAIN,IAArB6B,UAAUH,OAAe,CAACG,UAAU,IAAMC,MAAMF,MAAM,KAAMC,eAwCvEE,4BAZ8B,SAAShD,UAAWiD,mBAC9CC,OAASlD,UAAYiD,cACrBE,YAAcC,KAAKC,IAAIrD,UAAYiD,eAEnCK,kBAlPa,OAiPFJ,OAASE,KAAKG,MAAMJ,YAjPlB,OAiPkDC,KAAKI,KAAKL,YAjP5D,eAoPED,OAASD,cAAgBK,kBAAoBL,cAAgBK"}
\ No newline at end of file
diff --git a/lib/amd/src/local/templates/loader.js b/lib/amd/src/local/templates/loader.js
index 54a77a6a9bf..08f9778c4d0 100644
--- a/lib/amd/src/local/templates/loader.js
+++ b/lib/amd/src/local/templates/loader.js
@@ -346,7 +346,7 @@ export default class Loader {
                         component,
                         template: name,
                         themename: theme,
-                        lang: $('html').attr('lang').replace(/-/g, '_')
+                        lang: config.language,
                     }
                 });
                 // Remember the index in the requests list for this template so that
diff --git a/lib/amd/src/str.js b/lib/amd/src/str.js
index fef1dca942c..74cd8f6f997 100644
--- a/lib/amd/src/str.js
+++ b/lib/amd/src/str.js
@@ -24,6 +24,7 @@
  */
 import $ from 'jquery';
 import Ajax from 'core/ajax';
+import Config from 'core/config';
 import LocalStorage from 'core/localstorage';
 
 /**
@@ -129,7 +130,7 @@ export const getStrings = (requests) => Promise.all(getRequestedStrings(requests
  */
 const getRequestedStrings = (requests) => {
     let requestData = [];
-    const pageLang = $('html').attr('lang').replace(/-/g, '_');
+    const pageLang = Config.language;
 
     // Helper function to construct the cache key.
     const getCacheKey = ({key, component, lang = pageLang}) => `core_str/${key}/${component}/${lang}`;
@@ -256,13 +257,11 @@ export const get_strings = (requests) => {
  * @param {string} strings.key The string identifer to fetch
  * @param {string} strings.value The string value
  * @param {string} [strings.component='core'] The componet to fetch from
- * @param {string} [strings.lang] The language to fetch a string for. Defaults to current page language.
+ * @param {string} [strings.lang=Config.language] The language to fetch a string for. Defaults to current page language.
  */
 // eslint-disable-next-line camelcase
 export const cache_strings = (strings) => {
-    const defaultLang = $('html').attr('lang').replace(/-/g, '_');
-
-    strings.forEach(({key, component, value, lang = defaultLang}) => {
+    strings.forEach(({key, component, value, lang = Config.language}) => {
         const cacheKey = ['core_str', key, component, lang].join('/');
 
         // Check M.str caching.
diff --git a/lib/amd/src/user_date.js b/lib/amd/src/user_date.js
index 1360d555c92..f0c66dfde16 100644
--- a/lib/amd/src/user_date.js
+++ b/lib/amd/src/user_date.js
@@ -36,9 +36,8 @@ define(['jquery', 'core/ajax', 'core/sessionstorage', 'core/config'],
      * @return {string}
      */
     var getKey = function(request) {
-        var language = $('html').attr('lang').replace(/-/g, '_');
         return 'core_user_date/' +
-               language + '/' +
+               Config.language + '/' +
                Config.usertimezone + '/' +
                request.timestamp + '/' +
                request.format;
diff --git a/lib/outputrequirementslib.php b/lib/outputrequirementslib.php
index 2faa01e84d7..1f36e80706b 100644
--- a/lib/outputrequirementslib.php
+++ b/lib/outputrequirementslib.php
@@ -324,6 +324,7 @@ class page_requirements_manager {
                 'admin'                 => $CFG->admin,
                 'svgicons'              => $page->theme->use_svg_icons(),
                 'usertimezone'          => usertimezone(),
+                'language'              => current_language(),
                 'courseId'              => isset($courseid) ? (int) $courseid : 0,
                 'courseContextId'       => isset($coursecontext) ? $coursecontext->id : 0,
                 'contextid'             => $contextid,
diff --git a/lib/upgrade.txt b/lib/upgrade.txt
index 14746a6847b..5d1b6ece2a4 100644
--- a/lib/upgrade.txt
+++ b/lib/upgrade.txt
@@ -19,6 +19,7 @@ information provided here is intended especially for developers.
   that are also members of these groups.
 * The options for `format_string()`, and `format_text()` are now checked for incorrectly passed context objects.
   Please note that this was never an accepted value but previously failed silently.
+* The current page language is available in new `core/config` language property for Javascript modules
 
 === 4.3 ===