Merge branch 'MDL-29523-21_STABLE' of git://github.com/danpoltawski/m…

…oodle into MOODLE_21_STABLE
moodle · Feb 27, 2012 · 8774bde · 8774bde
2 parents 4e012c2 + 7020701
commit 8774bde
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/lib/form/filemanager.php b/lib/form/filemanager.php
@@ -274,6 +274,7 @@ function form_filemanager_render($options) {
     }
 
     $maxsize = get_string('maxfilesize', 'moodle', display_size(get_max_upload_file_size($CFG->maxbytes, $course_maxbytes, $options->maxbytes)));
+    $loading = get_string('loading', 'repository');
     $html .= <<<FMHTML
 <div class="filemanager-loading mdl-align" id='filemanager-loading-{$client_id}'>
 $icon_progress
@@ -288,7 +289,7 @@ function form_filemanager_render($options) {
     </div>
     <div class="filemanager-container" id="filemanager-{$client_id}">
         <ul id="draftfiles-{$client_id}" class="fm-filelist">
-            <li>Loading...</li>
+            <li>{$loading}</li>
         </ul>
     </div>
 </div>