Merge branch 'MDL-52486-master' of git://github.com/cameron1729/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 18 Jan 2016 11:19:55 +0000 (11:19 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 18 Jan 2016 11:19:55 +0000 (11:19 +0000)
lib/amd/build/str.min.js
lib/amd/src/str.js

index 33d26c9..d1e7660 100644 (file)
Binary files a/lib/amd/build/str.min.js and b/lib/amd/build/str.min.js differ
index 76830d3..c62ca7c 100644 (file)
@@ -96,7 +96,7 @@ define(['jquery', 'core/ajax', 'core/localstorage'], function($, ajax, storage)
             for (i = 0; i < requests.length; i++) {
                 request = requests[i];
                 if (typeof request.lang === "undefined") {
-                    request.lang = $('html').attr('lang');
+                    request.lang = $('html').attr('lang').replace('-', '_');
                 }
                 if (typeof M.str[request.component] === "undefined" ||
                         typeof M.str[request.component][request.key] === "undefined") {