Commit f86476bd authored by Kristina Hoeppner's avatar Kristina Hoeppner

Bug 1604601: Remove instances of "If set to 'On'"

They are not appropriate anymore with our move
to use "Yes/No" options instead.

Change-Id: I47fcf8d87ac647879d02d328b627e287bf4767a8
behatnotneeded: Only help description changes
parent 6de0f5af
......@@ -50,7 +50,7 @@ $form = array(
'type' => 'switchbox',
'class' => 'last',
'title' => get_string('updategroups', 'admin'),
'description' => get_string('updategroupsdescription1', 'admin'),
'description' => get_string('updategroupsdescription2', 'admin'),
'defaultvalue' => false,
),
'progress_meter_token' => array(
......
......@@ -90,21 +90,21 @@ $siteoptionform = array(
'dropdownmenu' => array(
'type' => 'switchbox',
'title' => get_string('dropdownmenu', 'admin'),
'description' => get_string('dropdownmenudescription1', 'admin'),
'description' => get_string('dropdownmenudescription2', 'admin'),
'defaultvalue' => get_config('dropdownmenu'),
'disabled' => in_array('dropdownmenu', $OVERRIDDEN),
),
'homepageinfo' => array(
'type' => 'switchbox',
'title' => get_string('homepageinfo1', 'admin'),
'description' => get_string('homepageinfodescription2', 'admin'),
'description' => get_string('homepageinfodescription3', 'admin'),
'defaultvalue' => get_config('homepageinfo'),
'disabled' => in_array('homepageinfo', $OVERRIDDEN),
),
'registration_sendweeklyupdates' => array(
'type' => 'switchbox',
'title' => get_string('sendweeklyupdates', 'admin'),
'description' => get_string('sendweeklyupdatesdescription1', 'admin'),
'description' => get_string('sendweeklyupdatesdescription2', 'admin'),
'defaultvalue' => get_config('registration_sendweeklyupdates'),
'help' => true,
'disabled' => in_array('registration_sendweeklyupdates', $OVERRIDDEN),
......
......@@ -80,7 +80,7 @@ $form = pieform(array(
'pageusedefault' => array(
'type' => 'switchbox',
'title' => get_string('usedefault', 'admin'),
'description' => get_string('usedefaultdescription2', 'admin'),
'description' => get_string('usedefaultdescription3', 'admin'),
'defaultvalue' => (get_config_institution($institutionelement['defaultvalue'], 'sitepages_' . DEFAULTPAGE) == 'mahara' ? 1 : 0),
),
'pagetext' => array(
......
......@@ -326,14 +326,14 @@ if ($institution || $add) {
$elements['registerallowed'] = array(
'type' => 'switchbox',
'title' => get_string('registrationallowed', 'admin'),
'description' => get_string('registrationalloweddescription4', 'admin'),
'description' => get_string('registrationalloweddescription5', 'admin'),
'defaultvalue' => $data->registerallowed,
'help' => true,
);
$elements['registerconfirm'] = array(
'type' => 'switchbox',
'title' => get_string('registrationconfirm', 'admin'),
'description' => get_string('registrationconfirmdescription2', 'admin'),
'description' => get_string('registrationconfirmdescription3', 'admin'),
'disabled' => get_config('requireregistrationconfirm') == true,
'defaultvalue' => $data->registerconfirm,
);
......@@ -384,7 +384,7 @@ if ($institution || $add) {
$elements['deletelogo'] = array(
'type' => 'switchbox',
'title' => get_string('deletelogo', 'admin'),
'description' => get_string('deletelogodescription1', 'admin'),
'description' => get_string('deletelogodescription2', 'admin'),
);
}
if (empty($data->name) || $data->name != 'mahara') {
......@@ -417,12 +417,12 @@ if ($institution || $add) {
'type' => 'switchbox',
'class' => 'nojs-hidden-inline',
'title' => get_string('resetcolours', 'admin'),
'description' => get_string('resetcoloursdesc1', 'admin'),
'description' => get_string('resetcoloursdesc2', 'admin'),
);
$elements['dropdownmenu'] = array(
'type' => 'switchbox',
'title' => get_string('dropdownmenu', 'admin'),
'description' => get_string('dropdownmenudescriptioninstitution1','admin'),
'description' => get_string('dropdownmenudescriptioninstitution2','admin'),
'defaultvalue' => $data->dropdownmenu,
'help' => true,
);
......@@ -432,7 +432,7 @@ if ($institution || $add) {
$elements['skins'] = array(
'type' => 'switchbox',
'title' => get_string('skins', 'admin'),
'description' => get_string('skinsinstitutiondescription1', 'admin'),
'description' => get_string('skinsinstitutiondescription2', 'admin'),
'defaultvalue' => $data->skins,
);
}
......@@ -467,7 +467,7 @@ if ($institution || $add) {
$elements['licensemandatory'] = array(
'type' => 'switchbox',
'title' => get_string('licensemandatory', 'admin'),
'description' => get_string('licensemandatorydescription','admin'),
'description' => get_string('licensemandatorydescription1','admin'),
'defaultvalue' => $data->licensemandatory,
);
$elements['licensedefault'] = license_form_el_basic(null, true);
......@@ -487,7 +487,7 @@ if ($institution || $add) {
$elements['updateuserquotas'] = array(
'type' => 'switchbox',
'title' => get_string('updateuserquotas', 'artefact.file'),
'description' => get_string('updateinstitutionuserquotasdesc1', 'admin'),
'description' => get_string('updateinstitutionuserquotasdesc2', 'admin'),
);
}
else {
......@@ -502,7 +502,7 @@ if ($institution || $add) {
$elements['allowinstitutionpublicviews'] = array(
'type' => 'switchbox',
'title' => get_string('allowinstitutionpublicviews', 'admin'),
'description' => get_string('allowinstitutionpublicviewsdescription1','admin'),
'description' => get_string('allowinstitutionpublicviewsdescription2','admin'),
'defaultvalue' => get_config('allowpublicviews') && $data->allowinstitutionpublicviews,
'disabled' => get_config('allowpublicviews') == false,
'help' => true,
......
......@@ -95,7 +95,7 @@ class PluginBlocktypeFolder extends MaharaCoreBlocktype {
'folderdownloadzip' => array(
'type' => 'switchbox',
'title' => get_string('downloadfolderzip', 'artefact.file'),
'description' => get_string('downloadfolderzipdescription2', 'artefact.file'),
'description' => get_string('downloadfolderzipdescription3', 'artefact.file'),
'defaultvalue' => get_config_plugin('blocktype', 'folder', 'folderdownloadzip'),
),
),
......
......@@ -33,9 +33,9 @@ $string['cannotdisplayslideshow'] = 'Cannot display slideshow.';
$string['gallerysettings'] = 'Gallery settings';
$string['useslimbox2'] = 'Use Slimbox 2';
$string['useslimbox2desc1'] = 'If set to "On", Slimbox 2 will be used in your gallery. When you click on images in your gallery, they will open in an overlay on the current page.';
$string['useslimbox2desc2'] = 'Use Slimbox 2 in your gallery. When you click on images in your gallery, they will open in an overlay on the current page.';
$string['photoframe'] = 'Use photo frame';
$string['photoframedesc1'] = 'If set to "On", a frame will be rendered around the thumbnail of each photo in the gallery.';
$string['photoframedesc2'] = 'Show a frame around the thumbnail of each photo in the gallery.';
$string['previewwidth'] = 'Maximum photo width';
$string['previewwidthdesc'] = 'Set the maximum width to which the photos will be resized when viewed with Slimbox 2.';
......
......@@ -450,13 +450,13 @@ class PluginBlocktypeGallery extends MaharaCoreBlocktype {
'useslimbox2' => array(
'type' => 'switchbox',
'title' => get_string('useslimbox2', 'blocktype.file/gallery'),
'description' => get_string('useslimbox2desc1', 'blocktype.file/gallery'),
'description' => get_string('useslimbox2desc2', 'blocktype.file/gallery'),
'defaultvalue' => get_config_plugin('blocktype', 'gallery', 'useslimbox2'),
),
'photoframe' => array(
'type' => 'switchbox',
'title' => get_string('photoframe', 'blocktype.file/gallery'),
'description' => get_string('photoframedesc1', 'blocktype.file/gallery'),
'description' => get_string('photoframedesc2', 'blocktype.file/gallery'),
'defaultvalue' => get_config_plugin('blocktype', 'gallery', 'photoframe'),
),
'previewwidth' => array(
......
......@@ -42,20 +42,20 @@ $string['Date'] = 'Date';
$string['resizeonupload'] = 'Resize images on upload';
$string['resizeonuploaddescription'] = 'Automatically resize large images on upload';
$string['resizeonuploaduseroption1'] = 'User option';
$string['resizeonuploaduseroptiondescription2'] = 'If set to "On", show users the option to enable or disable automatic resizing of large images when uploading.';
$string['resizeonuploaduseroptiondescription3'] = 'Show users the option to enable or disable automatic resizing of large images when uploading.';
$string['resizeonuploadenable1'] = 'Resize large images automatically';
$string['resizeonuploadenablefilebrowser1'] = 'Automatic resizing of images larger than %sx%s px (recommended)';
$string['resizeonuploadmaxwidth'] = 'Maximum width';
$string['resizeonuploadmaxheight'] = 'Maximum height';
$string['resizeonuploadenabledescription2'] = 'If set to "On", large images will be resized on upload if they exceed the maximum width and height settings.';
$string['resizeonuploadenabledescription3'] = 'Resize large images on upload if they exceed the maximum width and height settings.';
$string['defaultagreement'] = 'Default agreement';
$string['defaultquota'] = 'Default quota';
$string['defaultquotadescription'] = 'You can set the amount of disk space that new users will have as their quota here.';
$string['defaultuserquota'] = 'Default user quota';
$string['updateuserquotas'] = 'Update user quotas';
$string['updateuserquotasdesc1'] = 'If set to "On", the default quota you choose above will be applied to all existing users.';
$string['updateuserquotasdesc2'] = 'Apply the default quota you choose above to all existing users.';
$string['institutionoverride1'] = 'Institutional override';
$string['institutionoverridedescription1'] = 'If set to "On", you allow institution administrators to set user file quotas and have default quotas for each institution.';
$string['institutionoverridedescription2'] = 'Allow institution administrators to set user file quotas and have default quotas for each institution.';
$string['maxquotaenabled'] = 'Enforce a sitewide maximum quota';
$string['maxquota'] = 'Maximum quota';
$string['maxquotatoolow'] = 'The maximum quota cannot be lower than the default quota.';
......@@ -65,7 +65,7 @@ $string['maxquotadescription'] = 'You can set the maximum quota that an administ
$string['defaultgroupquota'] = 'Default group quota';
$string['defaultgroupquotadescription'] = 'You can set the amount of disk space that new groups can use in their files area.';
$string['updategroupquotas'] = 'Update group quotas';
$string['updategroupquotasdesc1'] = 'If set to "On", the default quota you choose above will be applied to all existing groups.';
$string['updategroupquotasdesc2'] = 'Apply the default quota you choose above to all existing groups.';
$string['deletingfailed'] = 'Deleting failed: the file or folder does not exist any more';
$string['deletefile?'] = 'Are you sure you want to delete this file?';
$string['deletefolder?'] = 'Are you sure you want to delete this folder?';
......@@ -193,7 +193,7 @@ $string['textlinktouser'] = 'Edit profile of %s';
$string['quotanotifylimittitle1'] = 'Quota notification threshold';
$string['quotanotifylimitdescr1'] = 'When a user\'s file upload quota is filled to this percentage, they (and the site administrators) will be sent a notification to let them know they are nearing their upload limit. They can then either delete files to free up space or contact their administrator to have their quota increased.';
$string['quotanotifyadmin1'] = 'Site administrator notification';
$string['quotanotifyadmindescr2'] = 'If set to "On", site administrators are notified when users reach the notification threshold.';
$string['quotanotifyadmindescr3'] = 'Notify site administrators when users reach the notification threshold.';
$string['useroverquotathreshold'] = 'User %s has arrived at %s%% percent of their %s quota. ';
// File types
......@@ -322,7 +322,7 @@ $string['filepermission.republish'] = 'Publish';
$string['zipdownloadheading'] = 'Folder downloads';
$string['downloadfolderzip'] = 'Download folders as a zip file';
$string['downloadfolderzipblock'] = 'Show download link';
$string['downloadfolderzipdescription2'] = 'If set to "On", users can download a folder displayed via the "Folder" block as a zip file.';
$string['downloadfolderzipdescription3'] = 'Allow users to download a folder displayed via the "Folder" block as a zip file.';
$string['downloadfolderzipdescriptionblock'] = 'If checked, users can download the folder as a zip file.';
$string['downloadfolderziplink'] = 'Download folder content as a zip file';
$string['folderdownloadnofolderfound'] = 'Unable to find the folder with ID %d';
......
......@@ -1479,7 +1479,7 @@ class ArtefactTypeFile extends ArtefactTypeFileBase {
),
'updateuserquotas' => array(
'title' => get_string('updateuserquotas', 'artefact.file'),
'description' => get_string('updateuserquotasdesc1', 'artefact.file'),
'description' => get_string('updateuserquotasdesc2', 'artefact.file'),
'type' => 'switchbox',
)
),
......@@ -1518,7 +1518,7 @@ class ArtefactTypeFile extends ArtefactTypeFileBase {
$elements['userquotafieldset']['elements']['quotanotifyadmin'] = array(
'type' => 'switchbox',
'title' => get_string('quotanotifyadmin1', 'artefact.file'),
'description' => get_string('quotanotifyadmindescr2', 'artefact.file'),
'description' => get_string('quotanotifyadmindescr3', 'artefact.file'),
'defaultvalue' => get_config_plugin('artefact', 'file', 'quotanotifyadmin'),
);
......@@ -1527,7 +1527,7 @@ class ArtefactTypeFile extends ArtefactTypeFileBase {
'type' => 'switchbox',
'title' => get_string('institutionoverride1', 'artefact.file'),
'defaultvalue' => $override,
'description' => get_string('institutionoverridedescription1', 'artefact.file')
'description' => get_string('institutionoverridedescription2', 'artefact.file')
);
$defaultgroupquota = get_config_plugin('artefact', 'file', 'defaultgroupquota');
......@@ -1549,7 +1549,7 @@ class ArtefactTypeFile extends ArtefactTypeFileBase {
),
'updategroupquotas' => array(
'title' => get_string('updategroupquotas', 'artefact.file'),
'description' => get_string('updategroupquotasdesc1', 'artefact.file'),
'description' => get_string('updategroupquotasdesc2', 'artefact.file'),
'type' => 'switchbox',
)
),
......@@ -1621,13 +1621,13 @@ class ArtefactTypeFile extends ArtefactTypeFileBase {
'type' => 'switchbox',
'title' => get_string('resizeonuploadenable1', 'artefact.file'),
'defaultvalue' => $resizeonuploadenable,
'description' => get_string('resizeonuploadenabledescription2', 'artefact.file'),
'description' => get_string('resizeonuploadenabledescription3', 'artefact.file'),
),
'resizeonuploaduseroption' => array(
'title' => get_string('resizeonuploaduseroption1', 'artefact.file'),
'type' => 'switchbox',
'defaultvalue' => $resizeonuploaduseroption,
'description' => get_string('resizeonuploaduseroptiondescription2', 'artefact.file'),
'description' => get_string('resizeonuploaduseroptiondescription3', 'artefact.file'),
),
'resizeonuploadmaxwidth' => array(
'type' => 'text',
......
This diff is collapsed.
......@@ -12,4 +12,4 @@
defined('INTERNAL') || die();
$string['exactusersearch'] = 'Exact user searches';
$string['exactusersearchdescription1'] = 'If set to "On", results from the "Search users" box and "Find friends" page are only returned for users whose profile fields match entire search terms.';
$string['exactusersearchdescription2'] = 'Results from the "Search users" box and "Find friends" page are only returned for users whose profile fields match entire search terms.';
......@@ -42,7 +42,7 @@ class PluginSearchInternal extends PluginSearch {
'elements' => array(
'exactusersearch' => array(
'title' => get_string('exactusersearch', 'search.internal'),
'description' => get_string('exactusersearchdescription1', 'search.internal'),
'description' => get_string('exactusersearchdescription2', 'search.internal'),
'help' => true,
'type' => 'switchbox',
'defaultvalue' => get_config_plugin('search', 'internal', 'exactusersearch'),
......
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