Commit efa1ff01 authored by Kristina Hoeppner's avatar Kristina Hoeppner Committed by Cecilia Vela Gurovic
Browse files

Bug 1858143: Replace "user" with more appropriate term

to humanise our language in Mahara more. Some
instances were not changed (yet) where "user" was the most
appropriate term or where "username" is still in place.

Change-Id: I3f744cf103533fc68512d25ea916a49fa1fd3d20
parent edb77733
......@@ -28,13 +28,13 @@ $options = array();
$options['adminpassword'] = new stdClass();
$options['adminpassword']->examplevalue = 'Password1!';
$options['adminpassword']->shortoptions = array('p');
$options['adminpassword']->description = get_string('cliadminpassword', 'admin');
$options['adminpassword']->description = get_string('cliadminpassword1', 'admin');
$options['adminpassword']->required = true;
$options['adminemail'] = new stdClass();
$options['adminemail']->examplevalue = 'user@example.org';
$options['adminemail']->shortoptions = array('e');
$options['adminemail']->description = get_string('cliadminemail', 'admin');
$options['adminemail']->description = get_string('cliadminemail1', 'admin');
$options['adminemail']->required = true;
$options['sitename'] = new stdClass();
......
......@@ -26,7 +26,7 @@ $regenerateform = pieform(array(
'title' => get_string('regenerateurls', 'admin'),
'class' => 'btn-primary',
'description' => get_string('regenerateurlsdescription', 'admin'),
'confirm' => get_string('regenerateurlsconfirm', 'admin'),
'confirm' => get_string('regenerateurlsconfirm1', 'admin'),
'value' => get_string('submit'),
),
),
......
......@@ -49,7 +49,7 @@ $networkingform = pieform(
'wwwroot' => array(
'type' => 'html',
'title' => get_string('wwwroot','admin'),
'description' => get_string('wwwrootdescription', 'admin'),
'description' => get_string('wwwrootdescription1', 'admin'),
'value' => get_config('wwwroot')
),
'pubkey' => array(
......
......@@ -105,7 +105,7 @@ $siteoptionform = array(
'homepageinfo' => array(
'type' => 'switchbox',
'title' => get_string('homepageinfo1', 'admin'),
'description' => get_string('homepageinfodescription3', 'admin'),
'description' => get_string('homepageinfodescription4', 'admin'),
'defaultvalue' => get_config('homepageinfo'),
'disabled' => in_array('homepageinfo', $OVERRIDDEN),
),
......@@ -228,7 +228,7 @@ $siteoptionform = array(
'showprogressbar' => array(
'type' => 'switchbox',
'title' => get_string('showprogressbar', 'admin'),
'description' => get_string('showprogressbardescription1', 'admin'),
'description' => get_string('showprogressbardescription2', 'admin'),
'defaultvalue' => get_config('showprogressbar'),
'disabled' => in_array('showprogressbar', $OVERRIDDEN),
),
......@@ -303,7 +303,7 @@ $siteoptionform = array(
'allowgroupcategories' => array(
'type' => 'switchbox',
'title' => get_string('allowgroupcategories', 'admin'),
'description' => get_string('allowgroupcategoriesdescription1', 'admin'),
'description' => get_string('allowgroupcategoriesdescription2', 'admin'),
'defaultvalue' => get_config('allowgroupcategories'),
'disabled' => in_array('allowgroupcategories', $OVERRIDDEN),
),
......@@ -432,7 +432,7 @@ $siteoptionform = array(
'defaultaccountinactivewarn' => array(
'type' => 'expiry',
'title' => get_string('defaultaccountinactivewarn', 'admin'),
'description' => get_string('defaultaccountinactivewarndescription', 'admin'),
'description' => get_string('defaultaccountinactivewarndescription1', 'admin'),
'defaultvalue' => get_config('defaultaccountinactivewarn'),
'help' => true,
'disabled' => in_array('defaultaccountinactivewarn', $OVERRIDDEN),
......@@ -658,7 +658,7 @@ $siteoptionform = array(
'allowpublicviews' => array(
'type' => 'switchbox',
'title' => get_string('allowpublicviews', 'admin'),
'description' => get_string('allowpublicviewsdescription1', 'admin'),
'description' => get_string('allowpublicviewsdescription2', 'admin'),
'defaultvalue' => get_config('allowpublicviews'),
'help' => true,
'disabled' => in_array('allowpublicviews', $OVERRIDDEN),
......@@ -713,15 +713,15 @@ $siteoptionform = array(
'showonlineuserssideblock' => array(
'type' => 'switchbox',
'title' => get_string('showonlineuserssideblock', 'admin'),
'description' => get_string('showonlineuserssideblockdescriptionmessage1', 'admin'),
'description' => get_string('showonlineuserssideblockdescriptionmessage2', 'admin'),
'defaultvalue' => get_config('showonlineuserssideblock'),
'disabled' => in_array('showonlineuserssideblock', $OVERRIDDEN),
),
'onlineuserssideblockmaxusers' => array(
'type' => 'text',
'size' => 4,
'title' => get_string('onlineuserssideblockmaxusers', 'admin'),
'description' => get_string('onlineuserssideblockmaxusersdescription', 'admin'),
'title' => get_string('onlineuserssideblockmaxusers1', 'admin'),
'description' => get_string('onlineuserssideblockmaxusersdescription1', 'admin'),
'defaultvalue' => get_config('onlineuserssideblockmaxusers'),
'rules' => array('integer' => true, 'minvalue' => 0, 'maxvalue' => 100),
'disabled' => in_array('onlineuserssideblockmaxusers', $OVERRIDDEN),
......@@ -736,7 +736,7 @@ $siteoptionform = array(
'licensemetadata' => array(
'type' => 'switchbox',
'title' => get_string('licensemetadata', 'admin'),
'description' => get_string('licensemetadatadescription', 'admin'),
'description' => get_string('licensemetadatadescription1', 'admin'),
'defaultvalue' => get_config('licensemetadata'),
'help' => true,
'disabled' => in_array('licensemetadata', $OVERRIDDEN),
......
......@@ -15,7 +15,7 @@ define('INTERNAL', 1);
define('ADMIN', 1);
define('MENUITEM', 'configusers/adminusers');
require(dirname(dirname(dirname(__FILE__))) . '/init.php');
define('TITLE', get_string('adminusers', 'admin'));
define('TITLE', get_string('adminusers1', 'admin'));
define('SECTION_PLUGINTYPE', 'core');
define('SECTION_PLUGINNAME', 'admin');
define('SECTION_PAGE', 'adminusers');
......@@ -30,7 +30,7 @@ $form = pieform(array(
'elements' => array(
'users' => array(
'type' => 'userlist',
'title' => get_string('adminusers', 'admin'),
'title' => get_string('adminusers1', 'admin'),
'defaultvalue' => $adminusers,
'lefttitle' => get_string('potentialadmins', 'admin'),
'righttitle' => get_string('currentadmins', 'admin'),
......
......@@ -188,7 +188,7 @@ $deleteform = pieform(array(
'type' => 'button',
'usebuttontag' => true,
'class' => 'btn-secondary',
'confirm' => get_string('confirmdeleteusers', 'admin'),
'confirm' => get_string('confirmdeleteusers1', 'admin'),
'value' => '<span class="icon icon-lg icon-user-times left text-danger" role="presentation" aria-hidden="true"></span>' . get_string('deleteusers', 'admin'),
),
),
......
......@@ -901,7 +901,7 @@ foreach ($institutions as $i) {
$i->institution.'_remove' => array(
'type' => 'submit',
'class' => 'btn-secondary',
'value' => get_string('removeuserfrominstitution', 'admin'),
'value' => get_string('removeuserfrominstitution1', 'admin'),
'confirm' => get_string('confirmremoveuserfrominstitution', 'admin'),
)
)
......@@ -924,7 +924,7 @@ if ($USER->get('admin')
if (!empty($options)) {
$elements['addinstitutionheader'] = array(
'type' => 'markup',
'value' => '<h4>' . get_string('addusertoinstitution', 'admin') . '</h4>',
'value' => '<h4>' . get_string('addusertoinstitution1', 'admin') . '</h4>',
);
$elements['addinstitution'] = array(
'type' => 'select',
......@@ -934,7 +934,7 @@ if ($USER->get('admin')
$elements['add'] = array(
'type' => 'submit',
'class' => 'btn-primary',
'value' => get_string('addusertoinstitution', 'admin'),
'value' => get_string('addusertoinstitution1', 'admin'),
);
}
}
......
......@@ -43,7 +43,7 @@ $form = array(
'elements' => array(
'users' => array(
'type' => 'userlist',
'title' => get_string('adminusers', 'admin'),
'title' => get_string('adminusers1', 'admin'),
'defaultvalue' => $adminusers,
'lefttitle' => get_string('institutionmembers', 'admin'),
'righttitle' => get_string('currentadmins', 'admin'),
......
......@@ -585,8 +585,8 @@ if ($institution || $add) {
$elements['allowinstitutionpublicviews'] = array(
'type' => 'switchbox',
'title' => get_string('allowinstitutionpublicviews', 'admin'),
'description' => get_string('allowinstitutionpublicviewsdescription2','admin'),
'title' => get_string('allowinstitutionpublicviews1', 'admin'),
'description' => get_string('allowinstitutionpublicviewsdescription3','admin'),
'defaultvalue' => get_config('allowpublicviews') && $data->allowinstitutionpublicviews,
'disabled' => get_config('allowpublicviews') == false,
'help' => true,
......@@ -595,7 +595,7 @@ if ($institution || $add) {
if ($USER->get('admin')) {
$elements['maxuseraccounts'] = array(
'type' => 'text',
'title' => get_string('maxuseraccounts','admin'),
'title' => get_string('maxuseraccounts1','admin'),
'description' => get_string('maxuseraccountsdescription','admin'),
'defaultvalue' => empty($data->maxuseraccounts) ? '' : $data->maxuseraccounts,
'rules' => array(
......
......@@ -43,7 +43,7 @@ $form = array(
'elements' => array(
'users' => array(
'type' => 'userlist',
'title' => get_string('staffusers', 'admin'),
'title' => get_string('staffusers1', 'admin'),
'defaultvalue' => $staffusers,
'lefttitle' => get_string('institutionmembers', 'admin'),
'righttitle' => get_string('institutionstaff', 'admin'),
......
......@@ -127,14 +127,14 @@ else if ($usertype == 'nonmembers') {
else if ($usertype == 'invited') {
// Allow invitations to be revoked
$userlistelement = array(
'title' => get_string('revokeinvitations', 'admin'),
'title' => get_string('revokeinvitation', 'admin'),
'lefttitle' => get_string('invitedusers', 'admin'),
'righttitle' => get_string('userstobeuninvited', 'admin'),
'leftarrowlabel' => get_string('moveusersfromuninvited', 'admin'),
'rightarrowlabel' => get_string('moveuserstouninvited', 'admin'),
'searchparams' => array('member' => 0, 'invitedby' => 1),
);
$submittext = get_string('revokeinvitations', 'admin');
$submittext = get_string('revokeinvitation', 'admin');
}
$userlistelement['type'] = 'userlist';
......@@ -317,7 +317,7 @@ $smarty = smarty();
setpageicon($smarty, 'icon-user-friends');
$smarty->assign('INLINEJAVASCRIPT', $js);
$smarty->assign('usertypeselector', $usertypeselector);
$smarty->assign('instructions', get_string('institutionusersinstructions' . $usertype . '1', 'admin', $userlistelement['lefttitle'], $userlistelement['righttitle']));
$smarty->assign('instructions', get_string('institutionusersinstructions' . $usertype . '2', 'admin', $userlistelement['lefttitle'], $userlistelement['righttitle']));
$smarty->assign('institutionusersform', $userlistform);
$smarty->assign('institutionselector', $institutionselector);
$smarty->display('admin/users/institutionusers.tpl');
......@@ -15,7 +15,7 @@ define('INTERNAL', 1);
define('ADMIN', 1);
define('MENUITEM', 'configusers/staffusers');
require(dirname(dirname(dirname(__FILE__))) . '/init.php');
define('TITLE', get_string('staffusers', 'admin'));
define('TITLE', get_string('staffusers1', 'admin'));
define('SECTION_PLUGINTYPE', 'core');
define('SECTION_PLUGINNAME', 'admin');
define('SECTION_PAGE', 'staffusers');
......@@ -29,7 +29,7 @@ $form = pieform(array(
'elements' => array(
'users' => array(
'type' => 'userlist',
'title' => get_string('staffusers', 'admin'),
'title' => get_string('staffusers1', 'admin'),
'defaultvalue' => $staffusers,
'lefttitle' => get_string('potentialstaff', 'admin'),
'righttitle' => get_string('currentstaff', 'admin'),
......
......@@ -208,7 +208,7 @@ $form = pieform_instance(array(
'type' => 'submit',
'isformgroup' => false,
'renderelementsonly' => true,
'confirm' => get_string('confirmdeleteusers', 'admin'),
'confirm' => get_string('confirmdeleteusers1', 'admin'),
'name' => 'delete',
'value' => get_string('deleteusers', 'admin')
)
......
......@@ -695,7 +695,7 @@ foreach ($ALLOWEDKEYS as $type) {
}
$fields .= "<div class=cl></div></ul>\n";
$uploadcsvpagedescription = get_string('uploadcsvpagedescription6', 'admin', $fields);
$uploadcsvpagedescription = get_string('uploadcsvpagedescription7', 'admin', $fields);
$form = pieform($form);
......
......@@ -96,7 +96,7 @@ To see %s online, follow this link:
%s";
$string['artefactdefaultpermissions'] = 'Default annotation permission';
$string['artefactdefaultpermissionsdescription'] = 'The selected artefact types will have feedback enabled on creation. Users can override these settings for individual artefacts.';
$string['artefactdefaultpermissionsdescription'] = 'The selected artefact types will have feedback enabled on creation. Authors can override these settings for individual artefacts.';
$string['annotationinformationerror'] = 'We do not have the right information to display the annotation.';
......@@ -113,8 +113,8 @@ $string['progress_annotation'] = array(
'Add %s annotations to pages',
);
$string['progress_annotationfeedback'] = array(
"Give 1 feedback to another user's annotation",
"Give %s feedbacks to other users' annotations",
"Give 1 feedback to another person's annotation",
"Give %s feedbacks to other people's annotations",
);
$string['duplicatedannotation'] = 'Duplicated annotation';
$string['existingannotation'] = 'Existing feedback';
......
......@@ -64,8 +64,8 @@ $string['moderatecomments'] = 'Moderate comments';
$string['moderatecommentsdescription2'] = 'Comments on pages and artefacts remain private until you approve them. Comments by people not logged into their accounts always go into a moderation queue and need to be approved.';
$string['newcommentnotificationsubject'] = 'New comment on %s';
$string['progress_feedback'] = array(
'Comment on another user\'s page',
'Comment on %s other users\' pages',
'Comment on another person\'s page',
'Comment on %s other people\'s pages',
);
$string['rating'] = 'Rating';
$string['reallydeletethiscomment'] = 'Are you sure you want to delete this comment?';
......@@ -113,7 +113,7 @@ To see %s online, follow this link:
%s";
$string['artefactdefaultpermissions'] = 'Default comment permission';
$string['artefactdefaultpermissionsdescription'] = 'The selected artefact types will have comments enabled on creation. Users can override these settings for individual artefacts.';
$string['artefactdefaultpermissionsdescription'] = 'The selected artefact types will have comments enabled on creation. Authors can override these settings for individual artefacts.';
// Extension config form
$string['commentratings'] = 'Enable comment ratings';
......
......@@ -46,8 +46,8 @@ $string['customagreement'] = 'Custom agreement';
$string['Date'] = 'Date';
$string['resizeonupload'] = 'Resize images on upload';
$string['resizeonuploaddescription'] = 'Automatically resize large images on upload';
$string['resizeonuploaduseroption1'] = 'User option';
$string['resizeonuploaduseroptiondescription3'] = 'Show users the option to enable or disable automatic resizing of large images when uploading.';
$string['resizeonuploaduseroption1'] = 'Personal option';
$string['resizeonuploaduseroptiondescription3'] = 'Show authors 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';
......@@ -55,18 +55,18 @@ $string['resizeonuploadmaxheight'] = 'Maximum height';
$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['updateuserquotasdesc2'] = 'Apply the default quota you choose above to all existing users.';
$string['defaultquotadescription'] = 'You can set the amount of disk space that new accounts will have as their quota here.';
$string['defaultuserquota'] = 'Default account quota';
$string['updateuserquotas'] = 'Update account quotas';
$string['updateuserquotasdesc2'] = 'Apply the default quota you choose above to all existing accounts.';
$string['institutionoverride1'] = 'Institutional override';
$string['institutionoverridedescription2'] = 'Allow institution administrators to set user file quotas and have default quotas for each institution.';
$string['institutionoverridedescription2'] = 'Allow institution administrators to set account 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.';
$string['maxquotaexceeded'] = 'You specified a quota above the maximum available setting for this site (%s). Try specifying a lower value or contact the site administrators to have them increase the maximum quota.';
$string['maxquotaexceededform'] = 'Please specify a file quota of less than %s.';
$string['maxquotadescription'] = 'You can set the maximum quota that an administrator can give to a user. Existing user quotas will not be affected.';
$string['maxquotadescription'] = 'You can set the maximum quota that an administrator can give. Existing account quotas will not be affected.';
$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';
......@@ -175,7 +175,7 @@ $string['typefile'] = 'File';
$string['typefolder'] = 'Folder';
$string['upload'] = 'Upload';
$string['uploadagreement'] = 'Upload agreement';
$string['uploadagreementdescription'] = 'Enable this option if you would like to force users to agree to the text below before they can upload a file to the site.';
$string['uploadagreementdescription'] = 'Enable this option if you would like to force authors to agree to the text below before they can upload a file to the site.';
$string['uploadexceedsquota'] = 'Uploading this file would exceed your disk quota. Try deleting some files you have uploaded.';
$string['uploadexceedsquotagroup'] = 'Uploading this file would exceed this group\'s disk quota. Try deleting some files you have uploaded.';
$string['uploadfile'] = 'Upload file';
......@@ -195,16 +195,16 @@ $string['insufficientmemoryforresize'] = ' (Not enough memory available to resiz
$string['quotanotifylimitoutofbounds'] = 'The notification limit is given in percent and has to be a number between 0 and 100.';
$string['usernotificationsubject'] = 'Your file storage is almost full';
$string['usernotificationmessage'] = 'You are using %s%% of your %s quota. You should get in touch with your site administrator about having your limit increased.';
$string['adm_notificationsubject'] = 'A user has nearly reached their file quota limit';
$string['adm_notificationmessage'] = 'User %s has arrived at %s%% percent of their %s quota. ';
$string['adm_notificationsubject'] = 'Someone has nearly reached their file quota limit';
$string['adm_notificationmessage'] = '%s has arrived at %s%% percent of their %s quota. ';
$string['adm_group_notificationsubject'] = 'A group that you administer has nearly reached their file quota limit';
$string['adm_group_notificationmessage'] = 'Group "%s" has arrived at %s%% percent of their %s quota. ';
$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['quotanotifylimitdescr1'] = 'When a person\'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['quotanotifyadmindescr3'] = 'Notify site administrators when users reach the notification threshold.';
$string['useroverquotathreshold'] = 'User %s has arrived at %s%% percent of their %s quota. ';
$string['quotanotifyadmindescr3'] = 'Notify site administrators when people reach the notification threshold.';
$string['useroverquotathreshold'] = '%s has arrived at %s%% percent of their %s quota. ';
// File types
$string['ai'] = 'Postscript document';
......@@ -343,8 +343,8 @@ $string['filepermission.republish'] = 'Publish';
$string['zipdownloadheading'] = 'Folder downloads';
$string['downloadfolderzip'] = 'Download folders as a zip file';
$string['downloadfolderzipblock'] = 'Show download link';
$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['downloadfolderzipdescription3'] = 'Allow people to download a folder displayed via the "Folder" block as a zip file.';
$string['downloadfolderzipdescriptionblock'] = 'If checked, people 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';
$string['zipfilenameprefix'] = 'folder';
......
<!-- @license http://www.gnu.org/copyleft/gpl.html GNU GPL version 3 or later -->
<!-- @copyright For copyright information on Mahara, please see the README file distributed with this software. -->
<h3>Profile picture size</h3>
<p>The profile picture size specifies a maximum height and width in pixels for a user’s profile picture. All images uploaded to the profile pictures area will be resized to these dimensions.</p>
<p>The profile picture size specifies a maximum height and width in pixels for profile pictures. All images uploaded to the profile pictures area will be resized to these dimensions.</p>
<!-- @license http://www.gnu.org/copyleft/gpl.html GNU GPL version 3 or later -->
<!-- @copyright For copyright information on Mahara, please see the README file distributed with this software. -->
<h3>Resize images on upload - maximum image size</h3>
<p>Maximum image size specifies a maximum pixel height and width for a user’s uploaded images. All images uploaded will be resized to these dimensions if they exceed the maximum image dimensions and image resizing is enabled.</p>
<p>Maximum image size specifies a maximum pixel height and width for uploaded images. All images uploaded will be resized to these dimensions if they exceed the maximum image dimensions and image resizing is enabled.</p>
......@@ -2,20 +2,20 @@
<!-- @copyright For copyright information on Mahara, please see the README file distributed with this software. -->
<h3>Profile pictures</h3>
<p>
The profile pictures area allows you to upload pictures that will appear beside
your name in many places in the system.
The profile pictures area allows you to upload pictures that will appear
beside your name in many places in the system.
</p>
<p>
You may have up to 5 pictures in your profile pictures area at once. Pictures you
upload must be at least 16x16 pixels and no greater than 1024x1024 pixels.
The images you upload count towards your file quota.
You may have up to five pictures in your profile pictures area at once.
Pictures you upload must be at least 16x16 pixels and no greater than
1024x1024 pixels. The images you upload count towards your file quota.
</p>
<p>
Your default icon will be shown to other people beside your name around the
site, and you may use the other images in the pages you create.
Your default profile picture will be shown to other people beside your name
around the site, and you may use the other images in the pages you create.
</p>
<p>
<strong>Note:</strong> All of your profile pictures (not just the default one)
can be accessed by other logged-in users. Delete them if you do not want
can be accessed by other logged-in people. Delete them if you do not want
others to see them.
</p>
Supports Markdown
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