Commit b87978e2 authored by Kristina Hoeppner's avatar Kristina Hoeppner

Change file quota string to not include MB (Bug 909831)

"File quota" should not have MB added to it because
usually we have a dropdown which can show the quota in
B, KB, MB, GB.

Change-Id: Ia34e2795373c55881856204d2b61d54bc97150fb
Signed-off-by: Kristina Hoeppner's avatarKristina D.C. Hoeppner <kristina@catalyst.net.nz>
parent 9cef0735
......@@ -45,7 +45,7 @@ $quotasform = pieform(array(
),
'quota' => array(
'type' => 'bytes',
'title' => get_string('filequota', 'admin'),
'title' => get_string('filequota1', 'admin'),
'description' => get_string('groupfilequotadescription', 'admin'),
'defaultvalue' => $group->quota,
),
......
......@@ -110,7 +110,7 @@ $elements = array(
),
'quota' => array(
'type' => 'bytes',
'title' => get_string('filequota','admin'),
'title' => get_string('filequota1','admin'),
'rules' => array('integer' => true, 'minvalue' => 0),
'defaultvalue' => get_config_plugin('artefact', 'file', 'defaultquota'),
),
......@@ -141,7 +141,7 @@ if (!($USER->get('admin') || get_config_plugin('artefact', 'file', 'institutiona
$elements['quota'] = array(
'type' => 'text',
'disabled' => true,
'title' => get_string('filequota', 'admin'),
'title' => get_string('filequota1', 'admin'),
'description' => get_string('filequotadescription', 'admin'),
'value' => display_size(get_config_plugin('artefact', 'file', 'defaultquota')),
);
......
......@@ -121,7 +121,7 @@ $quotaused = get_string('quotaused', 'admin') . ': ' . display_size($user->quota
if ($USER->get('admin') || get_config_plugin('artefact', 'file', 'institutionaloverride')) {
$elements['quota'] = array(
'type' => 'bytes',
'title' => get_string('filequota','admin'),
'title' => get_string('filequota1','admin'),
'description' => get_string('filequotadescription','admin') . '<br>' . $quotaused,
'rules' => array('integer' => true),
'defaultvalue' => $user->quota,
......@@ -131,7 +131,7 @@ else {
$elements['quota'] = array(
'type' => 'text',
'disabled' => true,
'title' => get_string('filequota', 'admin'),
'title' => get_string('filequota1', 'admin'),
'description' => get_string('filequotadescription', 'admin') . '<br>' . $quotaused,
'value' => display_size($user->quota),
);
......
......@@ -121,7 +121,7 @@ $form = array(
'authinstance' => $authinstanceelement,
'quota' => array(
'type' => 'bytes',
'title' => get_string('filequota', 'admin'),
'title' => get_string('filequota1', 'admin'),
'description' => get_string('filequotadescription', 'admin'),
'rules' => array('integer' => true, 'minvalue' => 0),
'defaultvalue' => get_config_plugin('artefact', 'file', 'defaultquota'),
......@@ -176,7 +176,7 @@ if (!($USER->get('admin') || get_config_plugin('artefact', 'file', 'institutiona
$form['elements']['quota'] = array(
'type' => 'text',
'disabled' => true,
'title' => get_string('filequota', 'admin'),
'title' => get_string('filequota1', 'admin'),
'description' => get_string('filequotadescription', 'admin'),
'value' => display_size(get_config_plugin('artefact', 'file', 'defaultquota')),
);
......
......@@ -630,7 +630,7 @@ $string['suspendedinfo'] = 'This user was suspended by %s on %s';
$string['deleteuser'] = 'Delete user';
$string['userdeletedsuccessfully'] = 'User deleted successfully';
$string['confirmdeleteuser'] = 'Are you sure you want to delete this user?';
$string['filequota'] = 'File quota (MB)';
$string['filequota1'] = 'File quota';
$string['quotaused'] = 'Quota used';
$string['filequotadescription'] = 'Total storage available in the user\'s files area.';
$string['addusertoinstitution'] = 'Add user to institution';
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment