From fa7f2a4579c89218ebdb3d8af1b069b338e4f6e8 Mon Sep 17 00:00:00 2001 From: Dongsheng Cai Date: Tue, 7 Sep 2010 10:06:57 +0000 Subject: [PATCH] MDL-24108, display max file size in filepicker and filemanager --- lang/en/moodle.php | 1 + lib/form/filemanager.php | 2 ++ lib/outputrenderers.php | 6 ++++-- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/lang/en/moodle.php b/lang/en/moodle.php index 092cbebb109..1cd5e479748 100644 --- a/lang/en/moodle.php +++ b/lang/en/moodle.php @@ -979,6 +979,7 @@ $string['maximumshort'] = 'Max'; $string['maximumupload'] = 'Maximum upload size'; $string['maximumupload_help'] = 'This setting determines the largest size of file that can be uploaded to the course, limited by the site-wide setting set by an administrator. Activity modules also include a maximum upload size setting for further restricting the file size.'; $string['maxsize'] = 'Max size: {$a}'; +$string['maxfilesize'] = 'Max single file size: {$a}'; $string['memberincourse'] = 'People in the course'; $string['messagebody'] = 'Message body'; $string['messagedselectedusers'] = 'Selected users have been messaged and the recipient list has been reset.'; diff --git a/lib/form/filemanager.php b/lib/form/filemanager.php index 44bef5cce04..6182d756fb6 100644 --- a/lib/form/filemanager.php +++ b/lib/form/filemanager.php @@ -265,6 +265,7 @@ function form_filemanager_render($options) { $extra = ''; } + $maxsize = get_string('maxfilesize', 'moodle', display_size(get_max_upload_file_size())); $html .= << $icon_progress @@ -275,6 +276,7 @@ $icon_progress + $maxsize
    diff --git a/lib/outputrenderers.php b/lib/outputrenderers.php index 9f4d166061a..70fbf9a2bc9 100644 --- a/lib/outputrenderers.php +++ b/lib/outputrenderers.php @@ -778,7 +778,7 @@ class core_renderer extends renderer_base { /** * Produces a header for a block - * + * * @param block_contents $bc * @return string */ @@ -812,7 +812,7 @@ class core_renderer extends renderer_base { $output .= $bc->content; $output .= $this->block_footer($bc); $output .= html_writer::end_tag('div'); - + return $output; } @@ -1914,6 +1914,7 @@ class core_renderer extends renderer_base { if (empty($currentfile)) { $currentfile = get_string('nofilesattached', 'repository'); } + $maxsize = get_string('maxfilesize', 'moodle', display_size(get_max_upload_file_size())); $html = << $icon_progress @@ -1921,6 +1922,7 @@ $icon_progress