Merge branch 'MDL-53577-fix' of https://github.com/andrewnicols/moodle

moodle · Apr 7, 2016 · ba1cdfe · ba1cdfe
2 parents b2c4091 + 82eb2cf
commit ba1cdfe
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/lib/form/dndupload.js b/lib/form/dndupload.js
@@ -617,10 +617,10 @@ M.form_dndupload.init = function(Y, options) {
          */
         display_size: function(size) {
             // This is snippet of code (with some changes) is from the display_size function in moodlelib.
-            var gb = M.util.get_string('sizegb'),
-                mb = M.util.get_string('sizemb'),
-                kb = M.util.get_string('sizekb'),
-                b  = M.util.get_string('sizeb');
+            var gb = M.util.get_string('sizegb', 'moodle'),
+                mb = M.util.get_string('sizemb', 'moodle'),
+                kb = M.util.get_string('sizekb', 'moodle'),
+                b  = M.util.get_string('sizeb', 'moodle');
 
             if (size >= 1073741824) {
                 size = Math.round(size / 1073741824 * 10) / 10 + gb;