Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Merge branch 'MDL-29523-master' of git://github.com/danpoltawski/moodle

  • Loading branch information...
commit ec1956655a14db1142bc67e2bf2424a2b392180c 2 parents 5dad459 + 1ab8cd2
Eloy Lafuente (stronk7) stronk7 authored

Showing 1 changed file with 2 additions and 1 deletion. Show diff stats Hide diff stats

  1. +2 1  lib/form/filemanager.php
3  lib/form/filemanager.php
@@ -378,6 +378,7 @@ function form_filemanager_render($options) {
378 378
379 379 $maxsize = get_string('maxfilesize', 'moodle', display_size(get_max_upload_file_size($CFG->maxbytes, $course_maxbytes, $options->maxbytes)));
380 380 $strdndenabled = get_string('dndenabled_insentence', 'moodle').$OUTPUT->help_icon('dndenabled');
  381 + $loading = get_string('loading', 'repository');
381 382 $html .= <<<FMHTML
382 383 <div class="filemanager-loading mdl-align" id='filemanager-loading-{$client_id}'>
383 384 $icon_progress
@@ -393,7 +394,7 @@ function form_filemanager_render($options) {
393 394 </div>
394 395 <div class="filemanager-container" id="filemanager-{$client_id}" style="position: relative" >
395 396 <ul id="draftfiles-{$client_id}" class="fm-filelist">
396   - <li>Loading...</li>
  397 + <li>{$loading}</li>
397 398 </ul>
398 399 </div>
399 400 </div>

0 comments on commit ec19566

Please sign in to comment.
Something went wrong with that request. Please try again.