Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch 'master' into install_master

  • Loading branch information...
commit a1327196eedd7223fe60eec6bbfbe74a15be6ad8 2 parents 4b5cc94 + 1e374df
AMOS bot authored
Showing with 252 additions and 216 deletions.
  1. +21 −21 admin/tool/installaddon/lang/en/tool_installaddon.php
  2. +31 −12 badges/award.php
  3. +14 −10 badges/backpack.js
  4. +3 −0  badges/criteria.php
  5. +3 −0  badges/edit.php
  6. +4 −0 badges/index.php
  7. +4 −0 badges/newbadge.php
  8. +3 −0  badges/overview.php
  9. +3 −0  badges/recipients.php
  10. +4 −0 badges/view.php
  11. +1 −1  blocks/badges/lang/en/block_badges.php
  12. +1 −1  blocks/glossary_random/lang/en/block_glossary_random.php
  13. +1 −1  blocks/mentees/lang/en/block_mentees.php
  14. +1 −1  blocks/news_items/lang/en/block_news_items.php
  15. +1 −1  blocks/online_users/lang/en/block_online_users.php
  16. +1 −1  cache/stores/mongodb/lang/en/cachestore_mongodb.php
  17. +3 −0  course/editsection_form.php
  18. +1 −1  grade/edit/tree/calculation.php
  19. +1 −1  grade/grading/form/rubric/lang/en/gradingform_rubric.php
  20. +1 −0  grade/import/xml/grade_import_form.php
  21. +14 −14 lang/en/admin.php
  22. +1 −1  lang/en/backup.php
  23. +19 −21 lang/en/badges.php
  24. +3 −3 lang/en/condition.php
  25. +1 −1  lang/en/hub.php
  26. +3 −5 lang/en/moodle.php
  27. +3 −3 lang/en/plugin.php
  28. +11 −3 lib/form/yui/dateselector/dateselector.js
  29. +1 −1  lib/navigationlib.php
  30. +6 −0 lib/upgradelib.php
  31. +1 −1  mod/assignment/lang/en/assignment.php
  32. +1 −1  mod/chat/lang/en/chat.php
  33. +1 −1  mod/feedback/lang/en/feedback.php
  34. +1 −3 mod/forum/lang/en/forum.php
  35. +18 −39 mod/lti/lang/en/lti.php
  36. +1 −1  mod/page/lang/en/page.php
  37. +1 −1  mod/resource/lang/en/resource.php
  38. +40 −41 mod/scorm/lang/en/scorm.php
  39. +1 −1  mod/scorm/report/basic/lang/en/scormreport_basic.php
  40. +1 −1  mod/scorm/report/interactions/lang/en/scormreport_interactions.php
  41. +0 −1  mod/url/lang/en/url.php
  42. +1 −0  mod/url/mod_form.php
  43. +1 −0  question/type/calculated/datasetitems_form.php
  44. +7 −7 question/type/numerical/edit_numerical_form.php
  45. +6 −8 repository/boxnet/lang/en/repository_boxnet.php
  46. +2 −2 theme/bootstrapbase/renderers.php
  47. 0  theme/bootstrapbase/renderers/{core.php → core_renderer.php}
  48. +1 −1  theme/bootstrapbase/version.php
  49. +2 −2 theme/formal_white/lang/en/theme_formal_white.php
  50. +2 −2 version.php
View
42 admin/tool/installaddon/lang/en/tool_installaddon.php
@@ -29,36 +29,36 @@
$string['acknowledgement'] = 'Acknowledgement';
$string['acknowledgementmust'] = 'You must acknowledge this';
$string['acknowledgementtext'] = 'I understand that it is my responsibility to have full backups of this site prior to installing add-ons. I accept and understand that add-ons (especially but not only those originating in unofficial sources) may contain security holes, can make the site unavailable, or cause private data leaks or loss.';
-$string['featuredisabled'] = 'Add-on installer is disabled at this site.';
+$string['featuredisabled'] = 'The add-on installer is disabled on this site.';
$string['installaddon'] = 'Install add-on!';
$string['installaddons'] = 'Install add-ons';
-$string['installexception'] = 'Oops... An error occured while trying to install the add-on. Turn debugging mode on to see more details about the error.';
-$string['installfromrepo'] = 'Install add-ons from Moodle plugins directory';
-$string['installfromrepo_help'] = 'You will be redirected to the Moodle plugins directory to search for and install an add-on. Note that your site fullname, URL and major version will be sent as well, to make the installation process easier for you.';
-$string['installfromzip'] = 'Install add-on from the ZIP file';
-$string['installfromzip_help'] = 'Alternatively to installing add-ons directly from the Moodle plugins directory, you can install add-ons from manually uploaded ZIP packages. Such ZIP packages are expected to have same structure as the ones available in the Moodle plugins directory.';
+$string['installexception'] = 'Oops... An error occurred while trying to install the add-on. Turn debugging mode on to see details of the error.';
+$string['installfromrepo'] = 'Install add-ons from the Moodle plugins directory';
+$string['installfromrepo_help'] = 'You will be redirected to the Moodle plugins directory to search for and install an add-on. Note that your site full name, URL and Moodle version will be sent as well, to make the installation process easier for you.';
+$string['installfromzip'] = 'Install add-on from ZIP file';
+$string['installfromzip_help'] = 'An alternative to installing an add-on directly from the Moodle plugins directory is to upload a ZIP package of the add-on. The ZIP package should have the same structure as a package downloaded from the Moodle plugins directory.';
$string['installfromzipfile'] = 'ZIP package';
-$string['installfromzipfile_help'] = 'The plugin ZIP package must contain just one directory with the name of the plugin. The ZIP will be extracted into the appropriate location for the given plugin type. Packages downloaded from the Moodle plugins directory have this format.';
+$string['installfromzipfile_help'] = 'The plugin ZIP package must contain just one directory, named to match the plugin. The ZIP will be extracted into an appropriate location for the plugin type. If the package has been downloaded from the Moodle plugins directory then it will have this structure.';
$string['installfromziprootdir'] = 'Rename the root directory';
-$string['installfromziprootdir_help'] = 'Some ZIP packages, such as those generated by Github, may contain incorrect name of the root directory. You can rename the root directory of the extracted package to the correct value defined in this field.';
+$string['installfromziprootdir_help'] = 'Some ZIP packages, such as those generated by Github, may contain an incorrect root directory name. If so, the correct name may be entered here.';
$string['installfromzipsubmit'] = 'Install add-on from the ZIP file';
$string['installfromziptype'] = 'Plugin type';
-$string['installfromziptype_help'] = 'Choose the correct type of plugin you are about to install. The installation procedure may fail badly when incorrect plugin type is provided.';
-$string['permcheck'] = 'Make sure the plugin type root location is writable by the web server process';
+$string['installfromziptype_help'] = 'Choose the correct type of plugin you are about to install. Warning: The installation procedure can fail badly if an incorrect plugin type is specified.';
+$string['permcheck'] = 'Make sure the plugin type root location is writable by the web server process.';
$string['permcheckerror'] = 'Error while checking for write permission';
$string['permcheckprogress'] = 'Checking for write permission ...';
-$string['permcheckresultno'] = 'Plugin type location <em>{$a->path}</em> not writable';
+$string['permcheckresultno'] = 'Plugin type location <em>{$a->path}</em> is not writable';
$string['permcheckresultyes'] = 'Plugin type location <em>{$a->path}</em> is writable';
$string['pluginname'] = 'Add-on installer';
-$string['remoterequestalreadyinstalled'] = 'There is a request to install add-on {$a->name} ({$a->component}) version {$a->version} from the Moodle plugins directory to this site. This plugin is <strong>already installed</strong> at this site.';
-$string['remoterequestconfirm'] = 'There is a request to install add-on <strong>{$a->name}</strong> ({$a->component}) version {$a->version} from the Moodle plugins directory to this site. If you continue, the add-on ZIP package will be downloaded for validation. Nothing will be installed yet.';
-$string['remoterequestinvalid'] = 'There is a request to install add-on from the Moodle plugins directory to this site. Unfortunately, the request is not valid. The add-on cannot be installed.';
-$string['remoterequestpermcheck'] = 'There is a request to install add-on {$a->name} ({$a->component}) version {$a->version} from the Moodle plugins directory to this site. The plugin type location <strong>{$a->typepath}</strong> is <strong>not writable</strong> though. You need to give the write access for the web server user to the plugin type location now. Once the write access is granted, press the continue button to repeat the check.';
-$string['remoterequestpluginfoexception'] = 'Oops... An error occured while trying to obtain information about the add-on {$a->name} ({$a->component}) version {$a->version}. The add-on cannot be installed. Turn debugging mode on to see more details about the error.';
+$string['remoterequestalreadyinstalled'] = 'There is a request to install add-on {$a->name} ({$a->component}) version {$a->version} from the Moodle plugins directory on this site. However, this plugin is <strong>already installed</strong> on the site.';
+$string['remoterequestconfirm'] = 'There is a request to install add-on <strong>{$a->name}</strong> ({$a->component}) version {$a->version} from the Moodle plugins directory on this site. If you continue, the add-on ZIP package will be downloaded for validation. Nothing will be installed yet.';
+$string['remoterequestinvalid'] = 'There is a request to install an add-on from the Moodle plugins directory on this site. Unfortunately the request is not valid and so the add-on cannot be installed.';
+$string['remoterequestpermcheck'] = 'There is a request to install add-on {$a->name} ({$a->component}) version {$a->version} from the Moodle plugins directory on this site. However, the plugin type location <strong>{$a->typepath}</strong> is <strong>not writable</strong>. You need to give write access for the web server user to the plugin type location, then press the continue button to repeat the check.';
+$string['remoterequestpluginfoexception'] = 'Oops... An error occurred while trying to obtain information about the add-on {$a->name} ({$a->component}) version {$a->version}. The add-on cannot be installed. Turn debugging mode on to see details of the error.';
$string['validation'] = 'Add-on package validation';
$string['validationmsg_componentmatch'] = 'Full component name';
$string['validationmsg_componentmismatchname'] = 'Add-on name mismatch';
-$string['validationmsg_componentmismatchname_help'] = 'Some ZIP packages, such as those generated by Github, may contain incorrect name of the root directory. You have to fix the name of the root directory to match the declared add-on name.';
+$string['validationmsg_componentmismatchname_help'] = 'Some ZIP packages, such as those generated by Github, may contain an incorrect root directory name. You need to fix the name of the root directory to match the declared add-on name.';
$string['validationmsg_componentmismatchname_info'] = 'The add-on declares its name is \'{$a}\' but that does not match the name of the root directory.';
$string['validationmsg_componentmismatchtype'] = 'Add-on type mismatch';
$string['validationmsg_componentmismatchtype_info'] = 'You have selected the type \'{$a->expected}\' but the add-on declares its type is \'{$a->found}\'.';
@@ -69,7 +69,7 @@
$string['validationmsg_maturity'] = 'Declared maturity level';
$string['validationmsg_maturity_help'] = 'The add-on can declare its maturity level. If the maintainer considers the add-on stable, the declared maturity level will read MATURITY_STABLE. All other maturity levels (such as alpha or beta) should be considered unstable and a warning is raised.';
$string['validationmsg_missingexpectedlangenfile'] = 'English language file name mismatch';
-$string['validationmsg_missingexpectedlangenfile_info'] = 'The given add-on type would need to provide the English language file {$a}.';
+$string['validationmsg_missingexpectedlangenfile_info'] = 'The given add-on type is missing the expected English language file {$a}.';
$string['validationmsg_missinglangenfile'] = 'No English language file found';
$string['validationmsg_missinglangenfolder'] = 'Missing English language folder';
$string['validationmsg_missingversion'] = 'Add-on does not declare its version';
@@ -83,8 +83,8 @@
$string['validationmsg_requiresmoodle'] = 'Required Moodle version';
$string['validationmsg_rootdir'] = 'Name of the add-on to be installed';
$string['validationmsg_rootdir_help'] = 'The name of the root directory in the ZIP package forms the name of the add-on to be installed. If the name is not correct, you may wish to rename the root directory in the ZIP prior to installing the add-on.';
-$string['validationmsg_rootdirinvalid'] = 'Invalid name of the add-on';
-$string['validationmsg_rootdirinvalid_help'] = 'The name of the root directory in the ZIP package violates formal syntax requirements. Some ZIP packages, such as those generated by Github, may contain incorrect name of the root directory. You have to fix the name of the root directory to match the add-on name.';
+$string['validationmsg_rootdirinvalid'] = 'Invalid add-on name';
+$string['validationmsg_rootdirinvalid_help'] = 'The name of the root directory in the ZIP package violates formal syntax requirements. Some ZIP packages, such as those generated by Github, may contain an incorrect root directory name. You need to fix the name of the root directory to match the add-on name.';
$string['validationmsg_targetexists'] = 'Target location already exists';
$string['validationmsg_targetexists_help'] = 'The directory that the add-on is to be installed to, must not exist yet.';
$string['validationmsg_unknowntype'] = 'Unknown plugin type';
@@ -93,7 +93,7 @@
$string['validationmsglevel_info'] = 'OK';
$string['validationmsglevel_warning'] = 'Warning';
$string['validationresult0'] = 'Validation failed!';
-$string['validationresult0_help'] = 'Some serious problem was detected. It is not safe to install the add-on. See the validation log messages for more details.';
+$string['validationresult0_help'] = 'A serious problem was detected and so it is not safe to install the add-on. See the validation log messages for details.';
$string['validationresult1'] = 'Validation passed!';
$string['validationresult1_help'] = 'No serious problems were detected. You can continue with the add-on installation. See the validation log messages for more details and eventual warnings.';
$string['validationresult1_help'] = 'The add-on package has been validated and no serious problems were detected.';
View
43 badges/award.php
@@ -30,6 +30,7 @@
$badgeid = required_param('id', PARAM_INT);
$role = optional_param('role', 0, PARAM_INT);
+$award = optional_param('award', false, PARAM_BOOL);
require_login();
@@ -44,6 +45,9 @@
$navurl = new moodle_url('/badges/index.php', array('type' => $badge->type));
if ($badge->type == BADGE_TYPE_COURSE) {
+ if (empty($CFG->badges_allowcoursebadges)) {
+ print_error('coursebadgesdisabled', 'badges');
+ }
require_login($badge->courseid);
$navurl = new moodle_url('/badges/index.php', array('type' => $badge->type, 'id' => $badge->courseid));
}
@@ -72,37 +76,52 @@
$output = $PAGE->get_renderer('core', 'badges');
// Roles that can award this badge.
-$accepted_roles = array_keys($badge->criteria[BADGE_CRITERIA_TYPE_MANUAL]->params);
+$acceptedroles = array_keys($badge->criteria[BADGE_CRITERIA_TYPE_MANUAL]->params);
-// If site admin, select a role to award a badge.
-if ($isadmin) {
- list($usertest, $userparams) = $DB->get_in_or_equal($accepted_roles, SQL_PARAMS_NAMED, 'existing', true);
+if (count($acceptedroles) > 1) {
+ // If there is more than one role that can award a badge, prompt user to make a selection.
+ // If it is an admin, include all accepted roles, otherwise only the ones that current user has in this context.
+ if ($isadmin) {
+ $selection = $acceptedroles;
+ } else {
+ // Get all the roles that user has and use the ones required by this badge.
+ $roles = get_user_roles($context, $USER->id);
+ $roleids = array_map(create_function('$o', 'return $o->roleid;'), $roles);
+ $selection = array_intersect($acceptedroles, $roleids);
+ }
+ list($usertest, $userparams) = $DB->get_in_or_equal($selection, SQL_PARAMS_NAMED, 'existing', true);
$options = $DB->get_records_sql('SELECT * FROM {role} WHERE id ' . $usertest, $userparams);
foreach ($options as $p) {
$select[$p->id] = role_get_name($p);
}
if (!$role) {
+ $pageurl = new moodle_url('/badges/award.php', array('id' => $badgeid));
echo $OUTPUT->header();
- echo $OUTPUT->box(get_string('adminaward', 'badges') . $OUTPUT->single_select(new moodle_url($PAGE->url), 'role', $select));
+ echo $OUTPUT->box(get_string('selectaward', 'badges') . $OUTPUT->single_select(new moodle_url($pageurl), 'role', $select));
echo $OUTPUT->footer();
die();
} else {
+ $pageurl = new moodle_url('/badges/award.php', array('id' => $badgeid));
$issuerrole = new stdClass();
$issuerrole->roleid = $role;
- $roleselect = get_string('adminaward', 'badges') . $OUTPUT->single_select(new moodle_url($PAGE->url), 'role', $select, $role);
+ $roleselect = get_string('selectaward', 'badges') . $OUTPUT->single_select(new moodle_url($pageurl), 'role', $select, $role);
}
} else {
- // Current user's role.
- $roles = get_user_roles($context, $USER->id);
- $issuerrole = array_shift($roles);
- if (!isset($issuerrole->roleid) || !in_array($issuerrole->roleid, $accepted_roles)) {
+ // User has to be an admin or the one with the required role.
+ $users = get_role_users($acceptedroles[0], $context, false, 'u.id', 'u.id ASC');
+ $usersids = array_keys($users);
+ if (!$isadmin && !in_array($USER->id, $usersids)) {
echo $OUTPUT->header();
$rlink = html_writer::link(new moodle_url('recipients.php', array('id' => $badge->id)), get_string('recipients', 'badges'));
echo $OUTPUT->notification(get_string('notacceptedrole', 'badges', $rlink));
echo $OUTPUT->footer();
die();
+ } else {
+ $issuerrole = new stdClass();
+ $issuerrole->roleid = $acceptedroles[0];
}
}
+
$options = array(
'badgeid' => $badge->id,
'context' => $context,
@@ -113,7 +132,7 @@
$recipientselector = new badge_potential_users_selector('potentialrecipients', $options);
$recipientselector->set_existing_recipients($existingselector->find_users(''));
-if (optional_param('award', false, PARAM_BOOL) && data_submitted() && has_capability('moodle/badges:awardbadge', $context)) {
+if ($award && data_submitted() && has_capability('moodle/badges:awardbadge', $context)) {
require_sesskey();
$users = $recipientselector->get_selected_users();
foreach ($users as $user) {
@@ -136,7 +155,7 @@
echo $OUTPUT->header();
echo $OUTPUT->heading($strrecipients);
-if ($isadmin) {
+if (count($acceptedroles) > 1) {
echo $OUTPUT->box($roleselect);
}
View
24 badges/backpack.js
@@ -10,19 +10,23 @@ function addtobackpack(event, args) {
*/
function check_site_access() {
var add = Y.one('#check_connection');
+
var callback = {
- success: function(o) {
- var data = Y.JSON.parse(o.responseText);
- if (data.code == 'http-unreachable') {
- add.setHTML(data.response);
- add.removeClass('hide');
+ method: "GET",
+ on: {
+ success: function(id, o, args) {
+ var data = Y.JSON.parse(o.responseText);
+ if (data.code == 'http-unreachable') {
+ add.setHTML(data.response);
+ add.removeClass('hide');
+ }
+ },
+ failure: function(o) { }
}
- },
- failure: function(o) { }
- };
+ };
- YUI().use('yui2-connection', function (Y) {
- Y.YUI2.util.Connect.asyncRequest('GET', 'ajax.php', callback, null);
+ Y.use('io-base', function(Y) {
+ Y.io('ajax.php', callback);
});
return false;
View
3  badges/criteria.php
@@ -41,6 +41,9 @@
$navurl = new moodle_url('/badges/index.php', array('type' => $badge->type));
if ($badge->type == BADGE_TYPE_COURSE) {
+ if (empty($CFG->badges_allowcoursebadges)) {
+ print_error('coursebadgesdisabled', 'badges');
+ }
require_login($badge->courseid);
$navurl = new moodle_url('/badges/index.php', array('type' => $badge->type, 'id' => $badge->courseid));
}
View
3  badges/edit.php
@@ -44,6 +44,9 @@
require_capability('moodle/badges:configuredetails', $context);
if ($badge->type == BADGE_TYPE_COURSE) {
+ if (empty($CFG->badges_allowcoursebadges)) {
+ print_error('coursebadgesdisabled', 'badges');
+ }
require_login($badge->courseid);
$navurl = new moodle_url('/badges/index.php', array('type' => $badge->type, 'id' => $badge->courseid));
}
View
4 badges/index.php
@@ -56,6 +56,10 @@
print_error('badgesdisabled', 'badges');
}
+if (empty($CFG->badges_allowcoursebadges) && ($type == BADGE_TYPE_COURSE)) {
+ print_error('coursebadgesdisabled', 'badges');
+}
+
$err = '';
$urlparams = array('sort' => $sortby, 'dir' => $sorthow, 'page' => $page);
View
4 badges/newbadge.php
@@ -37,6 +37,10 @@
print_error('badgesdisabled', 'badges');
}
+if (empty($CFG->badges_allowcoursebadges) && ($type == BADGE_TYPE_COURSE)) {
+ print_error('coursebadgesdisabled', 'badges');
+}
+
$title = get_string('create', 'badges');
if (($type == BADGE_TYPE_COURSE) && ($course = $DB->get_record('course', array('id' => $courseid)))) {
View
3  badges/overview.php
@@ -41,6 +41,9 @@
$navurl = new moodle_url('/badges/index.php', array('type' => $badge->type));
if ($badge->type == BADGE_TYPE_COURSE) {
+ if (empty($CFG->badges_allowcoursebadges)) {
+ print_error('coursebadgesdisabled', 'badges');
+ }
require_login($badge->courseid);
$navurl = new moodle_url('/badges/index.php', array('type' => $badge->type, 'id' => $badge->courseid));
}
View
3  badges/recipients.php
@@ -56,6 +56,9 @@
$navurl = new moodle_url('/badges/index.php', array('type' => $badge->type));
if ($badge->type == BADGE_TYPE_COURSE) {
+ if (empty($CFG->badges_allowcoursebadges)) {
+ print_error('coursebadgesdisabled', 'badges');
+ }
require_login($badge->courseid);
$navurl = new moodle_url('/badges/index.php', array('type' => $badge->type, 'id' => $badge->courseid));
}
View
4 badges/view.php
@@ -39,6 +39,10 @@
print_error('badgesdisabled', 'badges');
}
+if (empty($CFG->badges_allowcoursebadges) && $courseid != 0) {
+ print_error('coursebadgesdisabled', 'badges');
+}
+
if (!in_array($sortby, array('name', 'dateissued'))) {
$sortby = 'name';
}
View
2  blocks/badges/lang/en/block_badges.php
@@ -27,4 +27,4 @@
$string['numbadgestodisplay'] = 'Number of latest badges to display';
$string['nothingtodisplay'] = 'You have no badges to display';
$string['badges:addinstance'] = 'Add a new My latest badges block';
-$string['badges:myaddinstance'] = 'Add a new My latest badges block to the My Moodle page';
+$string['badges:myaddinstance'] = 'Add a new My latest badges block to My home';
View
2  blocks/glossary_random/lang/en/block_glossary_random.php
@@ -28,7 +28,7 @@
$string['askinvisible'] = 'When users cannot edit or view the glossary, show this text (without link)';
$string['askviewglossary'] = 'When users can view the glossary but not add entries, show a link with this text';
$string['glossary_random:addinstance'] = 'Add a new random glossary entry block';
-$string['glossary_random:myaddinstance'] = 'Add a new random glossary entry block to the My Moodle page';
+$string['glossary_random:myaddinstance'] = 'Add a new random glossary entry block to My home';
$string['intro'] = 'Make sure you have at least one glossary with at least one entry added to this course. Then you can adjust the following settings';
$string['invisible'] = '(to be continued)';
$string['lastmodified'] = 'Last modified entry';
View
2  blocks/mentees/lang/en/block_mentees.php
@@ -27,6 +27,6 @@
$string['configtitleblankhides'] = 'Block title (no title if blank)';
$string['leaveblanktohide'] = 'leave blank to hide the title';
$string['mentees:addinstance'] = 'Add a new mentees block';
-$string['mentees:myaddinstance'] = 'Add a new mentees block to the My Moodle page';
+$string['mentees:myaddinstance'] = 'Add a new mentees block to My home';
$string['newmenteesblock'] = '(new Mentees block)';
$string['pluginname'] = 'Mentees';
View
2  blocks/news_items/lang/en/block_news_items.php
@@ -24,5 +24,5 @@
*/
$string['news_items:addinstance'] = 'Add a new latest news block';
-$string['news_items:myaddinstance'] = 'Add a new latest news block to the My Moodle page';
+$string['news_items:myaddinstance'] = 'Add a new latest news block to My home';
$string['pluginname'] = 'Latest news';
View
2  blocks/online_users/lang/en/block_online_users.php
@@ -25,7 +25,7 @@
$string['configtimetosee'] = 'Number of minutes determining the period of inactivity after which a user is no longer considered to be online.';
$string['online_users:addinstance'] = 'Add a new online users block';
-$string['online_users:myaddinstance'] = 'Add a new online users block to the My Moodle page';
+$string['online_users:myaddinstance'] = 'Add a new online users block to My home';
$string['online_users:viewlist'] = 'View list of online users';
$string['periodnminutes'] = 'last {$a} minutes';
$string['pluginname'] = 'Online users';
View
2  cache/stores/mongodb/lang/en/cachestore_mongodb.php
@@ -32,7 +32,7 @@
$string['replicaset'] = 'Replica set';
$string['replicaset_help'] = 'The name of the replica set to connect to. If this is given the master will be determined by using the ismaster database command on the seeds, so the driver may end up connecting to a server that was not even listed.';
$string['server'] = 'Server';
-$string['server_help'] = 'This is the connection string for the server you want to use. Multiple servers can be specified by separating them with comma\'s';
+$string['server_help'] = 'This is the connection string for the server you want to use. Multiple servers can be specified using a comma-separated list.';
$string['testserver'] = 'Test server';
$string['testserver_desc'] = 'This is the connection string for the test server you want to use. Test servers are entirely optional, by specifiying a test server you can run PHPunit tests for this store and can run the performance tests.';
$string['username'] = 'Username';
View
3  course/editsection_form.php
@@ -21,6 +21,8 @@ function definition() {
$mform = $this->_form;
$course = $this->_customdata['course'];
+ $mform->addElement('header', 'generalhdr', get_string('general'));
+
$elementgroup = array();
$elementgroup[] = $mform->createElement('text', 'name', '', array('size' => '30'));
$elementgroup[] = $mform->createElement('checkbox', 'usedefaultname', '', get_string('sectionusedefaultname'));
@@ -58,6 +60,7 @@ public function definition_after_data() {
if (!empty($CFG->enableavailability)) {
$mform->addElement('header', 'availabilityconditions', get_string('availabilityconditions', 'condition'));
+ $mform->setExpanded('availabilityconditions', false);
// String used by conditions more than once
$strcondnone = get_string('none', 'condition');
// Grouping conditions - only if grouping is enabled at site level
View
2  grade/edit/tree/calculation.php
@@ -30,7 +30,7 @@
$courseid = required_param('courseid', PARAM_INT);
$id = required_param('id', PARAM_INT);
$section = optional_param('section', 'calculation', PARAM_ALPHA);
-$idnumbers = optional_param('idnumbers', null, PARAM_RAW);
+$idnumbers = optional_param_array('idnumbers', null, PARAM_RAW);
$url = new moodle_url('/grade/edit/tree/calculation.php', array('id'=>$id, 'courseid'=>$courseid));
if ($section !== 'calculation') {
View
2  grade/grading/form/rubric/lang/en/gradingform_rubric.php
@@ -36,7 +36,7 @@
$string['criterionmoveup'] = 'Move up';
$string['definerubric'] = 'Define rubric';
$string['description'] = 'Description';
-$string['enableremarks'] = 'Allow grader to add text remarks for each criteria';
+$string['enableremarks'] = 'Allow grader to add text remarks for each criterion';
$string['err_mintwolevels'] = 'Each criterion must have at least two levels';
$string['err_nocriteria'] = 'Rubric must contain at least one criterion';
$string['err_nodefinition'] = 'Level definition can not be empty';
View
1  grade/import/xml/grade_import_form.php
@@ -41,6 +41,7 @@ function definition () {
$mform->disabledIf('userfile', 'url', 'noteq', '');
$mform->addElement('text', 'url', get_string('fileurl', 'gradeimport_xml'), 'size="80"');
+ $mform->setType('url', PARAM_URL);
$mform->disabledIf('url', 'userfile', 'noteq', '');
if (!empty($CFG->gradepublishing)) {
View
28 lang/en/admin.php
@@ -152,8 +152,8 @@
$string['configcookiehttponly'] = 'Enables new PHP 5.2.0 feature - browsers are instructed to send cookie with real http requests only, cookies should not be accessible by scripting languages. This is not supported in all browsers and it may not be fully compatible with current code. It helps to prevent some types of XSS attacks.';
$string['configcookiesecure'] = 'If server is accepting only https connections it is recommended to enable sending of secure cookies. If enabled please make sure that web server is not accepting http:// or set up permanent redirection to https:// address. When <em>wwwroot</em> address does not start with https:// this setting is turned off automatically.';
$string['configcountry'] = 'If you set a country here, then this country will be selected by default on new user accounts. To force users to choose a country, just leave this unset.';
-$string['configcourseoverviewfilesext'] = 'Comma-separated list of allowed course overview files extensions';
-$string['configcourseoverviewfileslimit'] = 'Limit the number of files course managers are allowed to add to the course. They will be accessible by anyone from outside of the course just like course name and/or summary';
+$string['configcourseoverviewfilesext'] = 'A comma-separated list of allowed course summary files extensions.';
+$string['configcourseoverviewfileslimit'] = 'The maximum number of files that can be attached to a course summary.';
$string['configcourserequestnotify'] = 'Type username of user to be notified when new course requested.';
$string['configcourserequestnotify2'] = 'Users who will be notified when a course is requested. Only users who can approve course requests are listed here.';
$string['configcoursesperpage'] = 'Enter the number of courses to be displayed per page in a course listing.';
@@ -359,7 +359,7 @@
$string['coursecontact'] = 'Course contacts';
$string['coursecontact_desc'] = 'This setting allows you to control who appears on the course description. Users need to have at least one of these roles in a course to be shown on the course description for that course.';
$string['courselistshortnames'] = 'Display extended course names';
-$string['courselistshortnames_desc'] = 'When showing lists of courses, or when referring to courses on administration screens, show the course short name as well as the full name. In fact, when you turn this setting on, the display uses the \'courseextendednamedisplay\' language string, so you can changewhat is displayed using Language customisation.';
+$string['courselistshortnames_desc'] = 'If enabled, course short names will be displayed in addition to full names in course lists. If required, extended course names may be customised by editing the \'courseextendednamedisplay\' language string using the language customisation feature.';
$string['coursemgmt'] = 'Add/edit courses';
$string['courseoverview'] = 'Course overview';
$string['courserequestnotify'] = 'Course request notification';
@@ -755,7 +755,7 @@
$string['navshowmycoursecategories'] = 'Show my course categories';
$string['navshowmycoursecategories_help'] = 'If enabled courses in the users my courses branch will be shown in categories.';
$string['navsortmycoursessort'] = 'Sort my courses';
-$string['navsortmycoursessort_help'] = 'Determines how the courses displayed within the My courses branch on the navigation will be sorted. By default sortorder it used.';
+$string['navsortmycoursessort_help'] = 'This determines whether courses are listed under My courses according to the sort order (i.e. the order set in Settings > Site Administration > Courses > Add/edit courses) or alphabetically by course setting.';
$string['neverdeleteruns'] = 'Never delete runs';
$string['nobookmarksforuser'] = 'You do not have any bookmarks.';
$string['nodatabase'] = 'No database';
@@ -868,7 +868,7 @@
$string['profilingallowme'] = 'Selective profiling';
$string['profilingallowme_help'] = 'If you enable this setting, then, selectively, you can use the PROFILEME parameter anywhere (PGC) and profiling for that script will happen. Analogously, you can use the DONTPROFILEME parameter to prevent profiling to happen';
$string['profilingautofrec'] = 'Automatic profiling';
-$string['profilingautofrec_help'] = 'By configuring this setting, some request (randomly, based on the frecuency specified - 1 of XXX) will be picked and automatically profiled, storing results for further analysis. Note that this way of profiling observes the include/exclude settings. Set it to 0 to disable automatic profiling.';
+$string['profilingautofrec_help'] = 'By configuring this setting, some request (randomly, based on the frequency specified - 1 of N) will be picked and automatically profiled, storing results for further analysis. Note that this way of profiling observes the include/exclude settings. Set it to 0 to disable automatic profiling.';
$string['profilingenabled'] = 'Enable profiling';
$string['profilingenabled_help'] = 'If you enable this setting, then profiling will be available in this site and you will be able to define its behavior by configuring the next options.';
$string['profilingexcluded'] = 'Exclude profiling';
@@ -899,10 +899,10 @@
$string['registermoodleorg'] = 'When you register your site with {$a}';
$string['registermoodleorgli1'] = 'You are added to a low-volume mailing list for important notifications such as security alerts and new releases of Moodle.';
$string['registermoodleorgli2'] = 'Statistics about your site will be added to the {$a} of the worldwide Moodle community.';
-$string['registermoodleorgli3'] = 'Your site is also registered with the Moodle.org Open Community Hub ({$a}), allowing users with the publish courses capability (by default only managers) the option of publishing courses to MOOCH.';
+$string['registermoodleorgli3'] = 'Your site is also registered with Moodle.net ({$a}), allowing users with the publish courses capability (by default only managers) the option of publishing courses to Moodle.net.';
$string['registerwithmoodleorg'] = 'Register with Moodle.org';
$string['registration'] = 'Registration';
-$string['registration_help'] = 'Registering your site with Moodle.org is recommended in order to receive security alert notifications, to contribute <a href="http://moodle.org/stats">Moodle usage statistics</a> and to be able to share courses on <a href="http://hub.moodle.org/">MOOCH</a>.';
+$string['registration_help'] = 'Registering your site with Moodle.org is recommended in order to receive security alert notifications, to contribute <a href="http://moodle.org/stats">Moodle usage statistics</a> and to be able to share courses on <a href="http://moodle.net/">Moodle.net</a>.';
$string['registrationwarning'] = 'Your site is not yet registered.';
$string['releasenoteslink'] = 'For information about this version of Moodle, please see the online <a target="_blank" href="{$a}">Release Notes</a>';
$string['rememberusername'] = 'Remember username';
@@ -977,10 +977,10 @@
$string['sitesectionhelp'] = 'If selected, a topic section will be displayed on the site\'s front page.';
$string['slasharguments'] = 'Use slash arguments';
$string['smartpix'] = 'Smart pix search';
-$string['soaprecommended'] = 'Installing the optional soap extension is useful for web services and some contrib modules.';
-$string['sort_fullname'] = 'Fullname';
-$string['sort_idnumber'] = 'ID Number';
-$string['sort_shortname'] = 'Shortname';
+$string['soaprecommended'] = 'Installing the optional soap extension is useful for web services and some add-ons.';
+$string['sort_fullname'] = 'Course full name';
+$string['sort_idnumber'] = 'Course ID number';
+$string['sort_shortname'] = 'Course short name';
$string['sort_sortorder'] = 'Sort order';
$string['spellengine'] = 'Spell engine';
$string['spelllanguagelist'] = 'Spell language list';
@@ -1076,16 +1076,16 @@
The recommended way to clean your Moodle directory is as follows:
* rename the current Moodle directory to "moodle_old"
-* create a new Moodle directory containing only files from either a standard Moodle package download, or from the Moodle CVS or GIT repositories
+* create a new Moodle directory containing only files from either a standard Moodle package download, or from the Moodle Git repository
* move the original config.php file and any non-standard plugins from the "moodle_old" directory to the new Moodle directory
When you have a clean Moodle directory, refresh this page to resume the Moodle update process.
This warning is often caused by unzipping a standard Moodle package over a previous version of Moodle. While this is OK for minor upgrades, it is strongly discouraged for major Moodle upgrades.
-This warning can also be caused by an incomplete checkout or update operation from a CVS, SVN or GIT repository, in which case you may just have to wait for the operation complete, or perhaps run the appropriate clean up command and retry the operation.
+This warning can also be caused by an incomplete checkout or update operation from the Git repository, in which case you may just have to wait for the operation to complete, or perhaps run the appropriate clean-up command and retry the operation.
-You can find more information in upgrade documentation at <a href="{$a}">{$a}</a>';
+You can find more information in upgrade documentation at <a href="{$a}">{$a}</a>.';
$string['upgradesure'] = 'Your Moodle files have been changed, and you are about to automatically upgrade your server to this version: <br /><br />
<strong>{$a}</strong> <br /><br />
Once you do this you can not go back again. <br /><br />
View
2  lang/en/backup.php
@@ -238,7 +238,7 @@
$string['setting_overwriteconf'] = 'Overwrite course configuration';
$string['setting_course_fullname'] = 'Course name';
$string['setting_course_shortname'] = 'Course short name';
-$string['setting_course_startdate'] = 'Course startdate';
+$string['setting_course_startdate'] = 'Course start date';
$string['setting_keep_roles_and_enrolments'] = 'Keep current roles and enrolments';
$string['setting_keep_groups_and_groupings'] = 'Keep current groups and groupings';
$string['skiphidden'] = 'Skip hidden courses';
View
40 lang/en/badges.php
@@ -30,12 +30,11 @@
$string['activatesuccess'] = 'Access to the badges was successfully enabled.';
$string['addbadgecriteria'] = 'Add badge criteria';
$string['addcriteria'] = 'Add criteria';
-$string['addcriteriatext'] = 'To start adding criteria, please select one of the options from the drop down menu.';
+$string['addcriteriatext'] = 'To start adding criteria, please select one of the options from the drop-down menu.';
$string['addcourse'] = 'Add courses';
$string['addcourse_help'] = 'Select all courses that should be added to this badge requirement. Hold CTRL key to select multiple items.';
$string['addtobackpack'] = 'Add to backpack';
-$string['adminaward'] = 'As a site administrator, you can select a role to award this badge.';
-$string['adminonly'] = 'This page is restricted to Site Administrators only';
+$string['adminonly'] = 'This page is restricted to site administrators only.';
$string['after'] = 'after the date of issue.';
$string['aggregationmethod'] = 'Aggregation method';
$string['all'] = 'All';
@@ -45,11 +44,11 @@
$string['allmethodmanual'] = 'All of the selected roles award the badge';
$string['allmethodprofile'] = 'All of the selected profile fields have been completed';
$string['allowcoursebadges'] = 'Enable course badges';
-$string['allowcoursebadges_desc'] = 'Allow badges to be created and awarded in course context.';
+$string['allowcoursebadges_desc'] = 'Allow badges to be created and awarded in the course context.';
$string['allowexternalbackpack'] = 'Enable connection to external backpacks';
$string['allowexternalbackpack_desc'] = 'Allow users to set up connections and display badges from their external backpack providers.
-Note: It is recommended to leave this option disabled if the web site cannot be accessed from the internet (e.g. because of the firewall).';
+Note: It is recommended to leave this option disabled if the website cannot be accessed from the Internet (e.g. because of the firewall).';
$string['any'] = 'Any';
$string['anymethod'] = 'Any of the selected conditions is met';
$string['anymethodactivity'] = 'Any of the selected activities is complete';
@@ -63,20 +62,17 @@
$string['awardoncron'] = 'Access to the badges was successfully enabled. Too many users can instantly earn this badge. To ensure site performance, this action will take some time to process.';
$string['awards'] = 'Recipients';
$string['backpackavailability'] = 'External badge verification';
-$string['backpackavailability_help'] = 'For badge recipients to be able to prove they earned their badges from you, an external backpack service should be able to access your site and verify badges issued from it.
-Your site does not currently appear to be accessible, which means that badges you have already issued or will issue in the future cannot be verified.
+$string['backpackavailability_help'] = 'For badge recipients to be able to prove they earned their badges from you, an external backpack service should be able to access your site and verify badges issued from it. Your site does not currently appear to be accessible, which means that badges you have already issued or will issue in the future cannot be verified.
##Why am I seeing this message?
-It may be that your firewall prevents access from users outside your network, your site is password protected, or you are running the site on a computer that is not available from the internet (such as a local development machine).
+It may be that your firewall prevents access from users outside your network, your site is password protected, or you are running the site on a computer that is not available from the Internet (such as a local development machine).
##Is this a problem?
-You should fix this issue on any production site where you are planning to issue badges, otherwise the recipients will not be able to prove they earned their badges from you.
+You should fix this issue on any production site where you are planning to issue badges, otherwise the recipients will not be able to prove they earned their badges from you. If your site is not yet live you can create and issue test badges, as long as the site is accessible before you go live.
-If your site is not yet live you can create and issue test badges, as long as the site is accessible before you go live.
-
-##What if I can\'t make my whole site publically accessible?
+##What if I can\'t make my whole site publicly accessible?
The only URL required for verification is [your-site-url]/badges/assertion.php so if you are able to modify your firewall to allow external access to that file, badge verification will still work.';
$string['backpackbadges'] = 'You have {$a->totalbadges} badge(s) displayed from {$a->totalcollections} collection(s). <a href="mybackpack.php">Change backpack settings</a>.';
@@ -100,7 +96,7 @@
To add a new image, browse and select an image (in JPG or PNG format) then click "Save changes". The image will be cropped to a square and resized to match badge image requirements. ';
$string['badgeprivacysetting'] = 'Badge privacy settings';
-$string['badgeprivacysetting_help'] = 'Badges you earn can be displayed on your account profile page. This setting allows you to automatically set visibility of the newly earned badges.
+$string['badgeprivacysetting_help'] = 'Badges you earn can be displayed on your account profile page. This setting allows you to automatically set the visibility of the newly earned badges.
You can still control individual badge privacy settings on your "My badges" page.';
$string['badgeprivacysetting_str'] = 'Automatically show badges I earn on my profile page';
@@ -124,7 +120,7 @@
$string['boverview'] = 'Overview';
$string['bydate'] = ' complete by';
$string['clearsettings'] = 'Clear settings';
-$string['completionnotenabled'] = 'Course completion is not enabled for this course, so it cannot be included in badge criteria.<br/>You can enable course completion in the course settings.';
+$string['completionnotenabled'] = 'Course completion is not enabled for this course, so it cannot be included in badge criteria. Course completion may be enabled in the course settings.';
$string['completioninfo'] = 'This badge was issued for completing: ';
$string['configenablebadges'] = 'When enabled, this feature lets you create badges and award them to site users.';
$string['configuremessage'] = 'Badge message';
@@ -133,6 +129,7 @@
$string['contact'] = 'Contact';
$string['contact_help'] = 'An email address associated with the badge issuer.';
$string['copyof'] = 'Copy of {$a}';
+$string['coursebadgesdisabled'] = 'Course badges are not enabled on this site.';
$string['coursecompletion'] = 'Learners must complete this course. ';
$string['coursebadges'] = 'Badges';
$string['create'] = 'New badge';
@@ -200,7 +197,7 @@
$string['donotaward'] = 'Currently, this badge is not active, so it cannot be awarded to users. If you would like to award this badge, please set its status to active.';
$string['editsettings'] = 'Edit settings';
$string['enablebadges'] = 'Enable badges';
-$string['error:backpacknotavailable'] = 'Your site is not accessible from the Internet, so any badges issued from this site cannot be verified by external backpack services';
+$string['error:backpacknotavailable'] = 'Your site is not accessible from the Internet, so any badges issued from this site cannot be verified by external backpack services.';
$string['error:cannotact'] = 'Cannot activate the badge. ';
$string['error:cannotawardbadge'] = 'Cannot award badge to a user.';
$string['error:clone'] = 'Cannot clone the badge.';
@@ -210,7 +207,7 @@
$string['error:invalidexpiredate'] = 'Expiry date has to be in the future.';
$string['error:invalidexpireperiod'] = 'Expiry period cannot be negative or equal 0.';
$string['error:noactivities'] = 'There are no activities with completion criteria enabled in this course.';
-$string['error:nocourses'] = 'Course completion is not enabled for any of the courses in this site, so none can be displayed. You can enable course completion in the course settings.';
+$string['error:nocourses'] = 'Course completion is not enabled for any of the courses in this site, so none can be displayed. Course completion may be enabled in the course settings.';
$string['error:nogroups'] = '<p>There are no public collections of badges available in your backpack. </p>
<p>Only public collections are shown, <a href="http://backpack.openbadges.org">visit your backpack</a> to create some public collections.</p>';
$string['error:nopermissiontoview'] = 'You have no permissions to view badge recipients';
@@ -219,7 +216,7 @@
$string['error:nosuchfield'] = 'Warning: This user profile field is no longer available.';
$string['error:nosuchmod'] = 'Warning: This activity is no longer available.';
$string['error:nosuchrole'] = 'Warning: This role is no longer available.';
-$string['error:nosuchuser'] = 'User with this email address does not have an account with the current backpack provider';
+$string['error:nosuchuser'] = 'User with this email address does not have an account with the current backpack provider.';
$string['error:notifycoursedate'] = 'Warning: Badges associated with course and activity completions will not be issued until the course start date.';
$string['error:parameter'] = 'Warning: At least one parameter should be selected to ensure correct badge issuing workflow.';
$string['error:save'] = 'Cannot save the badge.';
@@ -240,7 +237,7 @@
$string['externalbadges_help'] = 'This area displays badges from your external backpack.';
$string['fixed'] = 'Fixed date';
$string['hidden'] = 'Hidden';
-$string['hiddenbadge'] = 'Unfortunately, badge owner has not made this information available.';
+$string['hiddenbadge'] = 'Unfortunately, the badge owner has not made this information available.';
$string['issuedbadge'] = 'Issued badge information';
$string['issuancedetails'] = 'Badge expiry';
$string['issuerdetails'] = 'Issuer details';
@@ -314,19 +311,20 @@
<p>Would you like to proceed?</p>';
$string['save'] = 'Save';
$string['searchname'] = 'Search by name';
+$string['selectaward'] = 'Please select the role you would like to use to award this badge: ';
$string['selectgroup_end'] = 'Only public collections are shown, <a href="http://backpack.openbadges.org">visit your backpack</a> to create more public collections.';
$string['selectgroup_start'] = 'Select collections from your backpack to display on this site:';
$string['selecting'] = 'With selected badges...';
$string['setup'] = 'Set up connection';
$string['sitebadges'] = 'Site badges';
-$string['sitebadges_help'] = 'Site badges can only be awarded to users for site related activities. These include completing a set of courses or parts of user profiles. Site badges can also be issued manually by one user to another.
+$string['sitebadges_help'] = 'Site badges can only be awarded to users for site-related activities. These include completing a set of courses or parts of user profiles. Site badges can also be issued manually by one user to another.
-Badges for course related activities must be created at a course level. Course badges can be found under Course Administration > Badges';
+Badges for course-related activities must be created at the course level. Course badges can be found under Course Administration > Badges.';
$string['statusmessage_0'] = 'This badge is currently not available to users. Enable access if you want users to earn this badge. ';
$string['statusmessage_1'] = 'This badge is currently available to users. Disable access to make any changes. ';
$string['statusmessage_2'] = 'This badge is currently not available to users, and its criteria are locked. Enable access if you want users to earn this badge. ';
$string['statusmessage_3'] = 'This badge is currently available to users, and its criteria are locked. ';
-$string['statusmessage_4'] = 'This badge is currently archived';
+$string['statusmessage_4'] = 'This badge is currently archived.';
$string['status'] = 'Badge status';
$string['status_help'] = 'Status of a badge determines its behaviour in the system:
View
6 lang/en/condition.php
@@ -30,7 +30,7 @@
$string['availablefrom'] = 'Allow access from';
$string['availablefrom_help'] = 'Access from/to dates determine when students can access the activity via a link on the course page.
-The difference between access from/to dates and availability settings for the activity is that outside the set dates the latter allows students to view the activity description, whereas access from/to dates prevent access completely.';
+The difference between access from/to dates and availability settings for the activity is that outside the set dates, access from/to prevents access completely, while availability allows students to view the activity description.';
$string['availableuntil'] = 'Allow access until';
$string['badavailabledates'] = 'Invalid dates. If you set both dates, the \'Allow access from\' date should be before the \'until\' date.';
$string['badgradelimits'] = 'If you set both an upper and lower grade limit, the upper limit must be higher than the lower limit.';
@@ -89,9 +89,9 @@
$string['requires_user_field_isequalto'] = 'Not available unless your <strong>{$a->field}</strong> is equal to <strong>{$a->value}</strong>.';
$string['requires_user_field_isnotempty'] = 'Not available if your <strong>{$a->field}</strong> is empty.';
$string['requires_user_field_startswith'] = 'Not available unless your <strong>{$a->field}</strong> starts withs <strong>{$a->value}</strong>.';
-$string['showavailability'] = 'Before activity can be accessed';
+$string['showavailability'] = 'While access is prevented';
$string['showavailabilitysection'] = 'Before section can be accessed';
-$string['showavailability_hide'] = 'Hide activity entirely';
+$string['showavailability_hide'] = 'Hide activity entirely in the course and gradebook';
$string['showavailability_show'] = 'Show activity greyed-out, with restriction information';
$string['showavailabilitysection_hide'] = 'Hide section entirely';
$string['showavailabilitysection_show'] = 'Show section greyed-out, with restriction information';
View
2  lang/en/hub.php
@@ -162,7 +162,7 @@
$string['registrationinfo'] = 'Registration information';
$string['registeredmoodleorg'] = 'Moodle.org ({$a})';
$string['registeredon'] = 'Hubs with which you are registered';
-$string['registermoochtips'] = 'To be registered with Moodle.org Open Community Hub (MOOCH), your site must be registered with Moodle.org.';
+$string['registermoochtips'] = 'In order to register with Moodle.net, your site must be registered with Moodle.org.';
$string['registersite'] = 'Register with {$a}';
$string['registerwith'] = 'Register with a hub';
$string['registrationconfirmed'] = 'Site registration confirmed';
View
8 lang/en/moodle.php
@@ -317,23 +317,21 @@
$string['coursehelpformat'] = 'The course main page will be displayed in this format.';
$string['coursehelphiddensections'] = 'How the hidden sections in the course are displayed to students.';
$string['coursehelpmaximumupload'] = 'Define the largest size of file that can be uploaded in this course, limited by the site-wide setting.';
-$string['coursehelpnewsitemsnumber'] = 'Number of recent items appearing on the course home page, in a news box down the right-hand side (0 means the news box won\'t appear).';
+$string['coursehelpnewsitemsnumber'] = 'Number of recent items from the news forum appearing in the latest news block on the course page. If set to zero, the latest news block will not be displayed.';
$string['coursehelpnumberweeks'] = 'Number of sections in the course (applies to certain course formats only).';
$string['coursehelpshowgrades'] = 'Enable the display of the gradebook. It does not prevent grades from being displayed within the individual activities.';
$string['coursehidden'] = 'This course is currently unavailable to students';
$string['courseoverviewfiles'] = 'Course summary files';
$string['courseoverviewfilesext'] = 'Course summary files extensions';
$string['courseoverviewfileslimit'] = 'Course summary files limit';
-$string['courseoverviewfiles_help'] = 'Course summary files (usually images) are displayed in the list of courses together with summary';
+$string['courseoverviewfiles_help'] = 'Course summary files, such as images, are displayed in the list of courses together with the summary.';
$string['courseinfo'] = 'Course info';
$string['coursemessage'] = 'Message course users';
$string['coursenotaccessible'] = 'This course does not allow public access';
$string['courselegacyfiles'] = 'Legacy course files';
$string['courselegacyfiles_help'] = 'The course files area provides some backward compatibility with Moodle 1.9 and earlier. All files in this area are always accessible to all participants in the course (whether you link to them or not) and there is no way to know where any of these files are being used in Moodle.
-If you use this area to store course files, you can expose yourself to a number of privacy and security issues, as well as experiencing missing files in backups, course imports and any time content is shared or re-used. It is therefore recommended that you do not use this area unless you really know what you are doing.
-
-The link below provides more information about all this and will show you some better ways to manage files in Moodle 2.';
+If you use this area to store course files, you can expose yourself to a number of privacy and security issues, as well as experiencing missing files in backups, course imports and any time content is shared or re-used. It is therefore recommended that you do not use this area unless you really know what you are doing.';
$string['courselegacyfiles_link'] = 'coursefiles2';
$string['courseoverview'] = 'Course overview';
$string['courseoverviewgraph'] = 'Course overview graph';
View
6 lang/en/plugin.php
@@ -35,8 +35,8 @@
$string['err_response_format_version'] = 'Unexpected version of the response format. Please try to re-check for available updates.';
$string['err_response_http_code'] = 'Unable to fetch available updates data - unexpected HTTP response code.';
$string['filterall'] = 'Show all';
-$string['filtercontribonly'] = 'Show contributions only';
-$string['filtercontribonlyactive'] = 'Showing contributions only';
+$string['filtercontribonly'] = 'Show add-ons only';
+$string['filtercontribonlyactive'] = 'Showing add-ons only';
$string['filterupdatesonly'] = 'Show updateable only';
$string['filterupdatesonlyactive'] = 'Showing updateable only';
$string['moodleversion'] = 'Moodle {$a}';
@@ -54,7 +54,7 @@
$string['notwritable_link'] = 'admin/mdeploy/notwritable';
$string['numtotal'] = 'Installed: {$a}';
$string['numdisabled'] = 'Disabled: {$a}';
-$string['numextension'] = 'Contributions: {$a}';
+$string['numextension'] = 'Add-ons: {$a}';
$string['numupdatable'] = 'Updates available: {$a}';
$string['otherplugin'] = '{$a->component}';
$string['otherpluginversion'] = '{$a->component} ({$a->version})';
View
14 lib/form/yui/dateselector/dateselector.js
@@ -97,7 +97,7 @@ YUI.add('moodle-form-dateselector', function(Y) {
focus_event : function(e) {
M.form.dateselector.cancel_any_timeout();
// If the current owner is set, then the pop-up is currently being displayed, so hide it.
- if (M.form.dateselector.currentowner) {
+ if (M.form.dateselector.currentowner == this) {
this.release_calendar();
} else if ((this.enablecheckbox == null)
|| (this.enablecheckbox.get('checked'))) { // Must be hidden. If the field is enabled display the pop-up.
@@ -116,8 +116,16 @@ YUI.add('moodle-form-dateselector', function(Y) {
},
claim_calendar : function() {
M.form.dateselector.cancel_any_timeout();
- this.connect_handlers();
- this.set_date_from_selects();
+ if (M.form.dateselector.currentowner == this) {
+ return;
+ }
+ if (M.form.dateselector.currentowner) {
+ M.form.dateselector.currentowner.release_calendar();
+ }
+ if (M.form.dateselector.currentowner != this) {
+ this.connect_handlers();
+ this.set_date_from_selects();
+ }
M.form.dateselector.currentowner = this;
M.form.dateselector.calendar.cfg.setProperty('mindate', new Date(this.yearselect.firstOptionValue(), 0, 1));
M.form.dateselector.calendar.cfg.setProperty('maxdate', new Date(this.yearselect.lastOptionValue(), 11, 31));
View
2  lib/navigationlib.php
@@ -2498,7 +2498,7 @@ public function add_front_page_course_essentials(navigation_node $coursenode, st
}
//Badges
- if (!empty($CFG->enablebadges) && has_capability('moodle/badges:viewbadges', $this->page->context)) {
+ if (!empty($CFG->enablebadges) && !empty($CFG->badges_allowcoursebadges) && has_capability('moodle/badges:viewbadges', $this->page->context)) {
$url = new moodle_url($CFG->wwwroot . '/badges/view.php', array('type' => 1));
$coursenode->add(get_string('sitebadges', 'badges'), $url, navigation_node::TYPE_CUSTOM);
}
View
6 lib/upgradelib.php
@@ -1299,6 +1299,12 @@ function upgrade_finished($continueurl=null) {
if (!empty($CFG->upgraderunning)) {
unset_config('upgraderunning');
+ // We have to forcefully purge the caches using the writer here.
+ // This has to be done after we unset the config var. If someone hits the site while this is set they will
+ // cause the config values to propogate to the caches.
+ // Caches are purged after the last step in an upgrade but there is several code routines that exceute between
+ // then and now that leaving a window for things to fall out of sync.
+ cache_helper::purge_all(true);
upgrade_setup_debug(false);
ignore_user_abort(false);
if ($continueurl) {
View
2  mod/assignment/lang/en/assignment.php
@@ -58,7 +58,7 @@
$string['cannotdeletefiles'] = 'An error occurred and files could not be deleted';
$string['cannotviewassignment'] = 'You can not view this assignment';
$string['changegradewarning'] = 'This assignment has graded submissions and changing the grade will not automatically re-calculate existing submission grades. You must re-grade all existing submissions, if you wish to change the grade.';
-$string['closedassignment'] = 'The submission date for this assignment has been closed.';
+$string['closedassignment'] = 'This assignment is closed, as the submission deadline has passed.';
$string['comment'] = 'Comment';
$string['commentinline'] = 'Comment inline';
$string['commentinline_help'] = 'If enabled, the submission text will be copied into the feedback comment field during grading, making it easier to comment inline (using a different colour, perhaps) or to edit the original text.';
View
2  mod/chat/lang/en/chat.php
@@ -23,7 +23,7 @@
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
-$string['activityoverview'] = 'You have upcoming chat';
+$string['activityoverview'] = 'You have upcoming chat sessions';
$string['ajax'] = 'Version using Ajax';
$string['autoscroll'] = 'Auto scroll';
$string['beep'] = 'Beep';
View
2  mod/feedback/lang/en/feedback.php
@@ -90,7 +90,7 @@
$string['drop_feedback'] = 'Remove from this course';
$string['edit_item'] = 'Edit question';
$string['edit_items'] = 'Edit questions';
-$string['email_notification'] = 'Send e-mail notifications';
+$string['email_notification'] = 'Enable notification of submissions';
$string['email_notification_help'] = 'If enabled, administrators receive email notification of feedback submissions.';
$string['emailteachermail'] = '{$a->username} has completed feedback activity : \'{$a->feedback}\'
View
4 mod/forum/lang/en/forum.php
@@ -390,9 +390,7 @@
$string['subscription_help'] = 'If you are subscribed to a forum it means you will receive email copies of forum posts. Usually you can choose whether you wish to be subscribed, though sometimes subscription is forced so that everyone receives email copies of forum posts.';
$string['subscriptionandtracking'] = 'Subscription and tracking';
$string['subscriptionmode'] = 'Subscription mode';
-$string['subscriptionmode_help'] = 'When a participant is subscribed to a forum it means they will receive email copies of forum posts.
-
-There are 4 subscription mode options:
+$string['subscriptionmode_help'] = 'When a participant is subscribed to a forum it means they will receive forum post notifications. There are 4 subscription mode options:
* Optional subscription - Participants can choose whether to be subscribed
* Forced subscription - Everyone is subscribed and cannot unsubscribe
View
57 mod/lti/lang/en/lti.php
@@ -400,48 +400,27 @@
$string['tool_settings'] = 'Tool Settings';
$string['toolsetup'] = 'External Tool Configuration';
$string['toolurl'] = 'Tool Base URL';
-$string['toolurl_help'] = 'The tool base URL is used to match tool launch URLs to the correct tool configuration. Prefxing the URL with http(s) is optional.
+$string['toolurl_help'] = 'The tool base URL is used to match tool launch URLs to the correct tool configuration. Prefixing the URL with http(s) is optional.
Additionally, the base URL is used as the launch URL if a launch URL is not specified in the external tool instance.
-<table>
- <thead>
- <tr>
- <td>
- <b>Base URL</b>
- </td>
- <td>
- <b>Matches</b>
- </td>
- </tr>
- </thead>
- <tbody>
- <tr>
- <td>
- tool.com
- </td>
- <td>
- tool.com, tool.com/quizzes, tool.com/quizzes/quiz.php?id=10, www.tool.com/quizzes
- </td>
- </tr>
- <tr>
- <td>
- www.tool.com/quizzes
- </td>
- <td>
- tool.com/quizzes, tool.com/quizzes/take.php?id=10, www.tool.com/quizzes
- </td>
- </tr>
- <tr>
- <td>
- quiz.tool.com
- </td>
- <td>
- quiz.tool.com, quiz.tool.com/take.php?id=10
- </td>
- </tr>
- </tbody>
-</table>
+For example, a base URL of *tool.com* would match the following:
+
+* tool.com
+* tool.com/quizzes
+* tool.com/quizzes/quiz.php?id=10
+* www.tool.com/quizzes
+
+A base URL of *www.tool.com/quizzes* would match the following:
+
+* www.tool.com/quizzes
+* tool.com/quizzes
+* tool.com/quizzes/take.php?id=10
+
+A base URL of *quiz.tool.com* would match the following:
+
+* quiz.tool.com
+* quiz.tool.com/take.php?id=10
If two different tool configurations are for the same domain, the most specific match will be used.';
$string['typename'] = 'Tool Name';
View
2  mod/page/lang/en/page.php
@@ -47,7 +47,7 @@
$string['modulename_link'] = 'mod/page/view';
$string['modulenameplural'] = 'Pages';
$string['neverseen'] = 'Never seen';
-$string['optionsheader'] = 'Options';
+$string['optionsheader'] = 'Display options';
$string['page-mod-page-x'] = 'Any page module page';
$string['page:addinstance'] = 'Add a new page resource';
$string['page:view'] = 'View page content';
View
2  mod/resource/lang/en/resource.php
@@ -78,7 +78,7 @@
$string['modulenameplural'] = 'Files';
$string['neverseen'] = 'Never seen';
$string['notmigrated'] = 'This legacy resource type ({$a}) was not yet migrated, sorry.';
-$string['optionsheader'] = 'Options';
+$string['optionsheader'] = 'Display options';
$string['page-mod-resource-x'] = 'Any file module page';
$string['pluginadministration'] = 'File module administration';
$string['pluginname'] = 'File';
View
81 mod/scorm/lang/en/scorm.php
@@ -23,7 +23,7 @@
*/
$string['toc'] = 'TOC';
$string['navigation'] = 'Navigation';
-$string['aicchacptimeout'] = 'AICC HACP Timeout';
+$string['aicchacptimeout'] = 'AICC HACP timeout';
$string['aicchacptimeout_desc'] = 'Length of time in minutes that an external AICC HACP session can remain open';
$string['aicchacpkeepsessiondata'] = 'AICC HACP session data';
$string['aicchacpkeepsessiondata_desc'] = 'Length of time in days to keep the external AICC HACP session data (a high setting will fill up the table with old data but may be useful when debugging)';
@@ -35,7 +35,7 @@
$string['advanced'] = 'Parameters';
$string['allowapidebug'] = 'Activate API debug and tracing (set the capture mask with apidebugmask)';
$string['allowtypeexternal'] = 'Enable external package type';
-$string['allowtypeexternalaicc'] = 'Enable direct AICC url';
+$string['allowtypeexternalaicc'] = 'Enable direct AICC URL';
$string['allowtypeexternalaicc_desc'] = 'If enabled this allows a direct url to a simple AICC package';
$string['allowtypeimsrepository'] = 'Enable IMS package type';
$string['allowtypelocalsync'] = 'Enable downloaded package type';
@@ -57,7 +57,7 @@
$string['attr_error'] = 'Bad value for attribute ({$a->attr}) in tag {$a->tag}.';
$string['autocontinue'] = 'Auto-continue';
$string['autocontinue_help'] = 'If enabled, subsequent learning objects are launched automatically, otherwise the Continue button must be used.';
-$string['autocontinuedesc'] = 'This preference sets the default auto continue for the activity';
+$string['autocontinuedesc'] = 'If enabled, subsequent learning objects are launched automatically, otherwise the Continue button must be used.';
$string['averageattempt'] = 'Average attempts';
$string['badmanifest'] = 'Some manifest errors: see errors log';
$string['badpackage'] = 'The specified package/manifest is not valid. Check it and try again.';
@@ -92,17 +92,17 @@
$string['display'] = 'Display package';
$string['displayattemptstatus'] = 'Display attempt status';
$string['displayattemptstatus_help'] = 'This preference allows a summary of the users attempts to show in the course overview block in My home and/or the SCORM entry page.';
-$string['displayattemptstatusdesc'] = 'This preference sets the default value for the display attempt status setting';
+$string['displayattemptstatusdesc'] = 'Whether a summary of the user\'s attempts is shown in the course overview block in My home and/or the SCORM entry page.';
$string['displaycoursestructure'] = 'Display course structure on entry page';
$string['displaycoursestructure_help'] = 'If enabled, the table of contents is displayed on the SCORM outline page.';
-$string['displaycoursestructuredesc'] = 'This preference sets the default value for the display course structure on entry page setting';
-$string['displaydesc'] = 'This preference sets the default of whether to display the package or not for an activity';
-$string['displaysettings'] = 'Display Settings';
+$string['displaycoursestructuredesc'] = 'If enabled, the table of contents is displayed on the SCORM outline page.';
+$string['displaydesc'] = 'Whether to display the SCORM package in a new window.';
+$string['displaysettings'] = 'Display settings';
$string['dnduploadscorm'] = 'Add a SCORM package';
$string['domxml'] = 'DOMXML external library';
$string['duedate'] = 'Due date';
$string['element'] = 'Element';
-$string['elementdefinition'] = 'Element Definition';
+$string['elementdefinition'] = 'Element definition';
$string['enter'] = 'Enter';
$string['entercourse'] = 'Enter course';
$string['errorlogs'] = 'Errors log';
@@ -119,17 +119,17 @@
$string['firstaccess'] = 'First access';
$string['firstattempt'] = 'First attempt';
$string['forcecompleted'] = 'Force completed';
-$string['forcecompleted_help'] = 'If enabled, the status of the current attempt is forced to "completed". This setting is only applicable to SCORM 1.2 packages. It is useful if the SCORM package does not handle revisiting an attempt correctly, in review or browse mode, or otherwise incorrectly issues the completion status.';
+$string['forcecompleted_help'] = 'If enabled, the status of the current attempt is forced to "completed". (Only applicable to SCORM 1.2 packages.)';
$string['forcecompleteddesc'] = 'This preference sets the default value for the force completed setting';
$string['forcenewattempt'] = 'Force new attempt';
$string['forcenewattempt_help'] = 'If enabled, each time a SCORM package is accessed will be counted as a new attempt.';
-$string['forcenewattemptdesc'] = 'This preference sets the default value for the force new attempt setting';
+$string['forcenewattemptdesc'] = 'If enabled, each time a SCORM package is accessed will be counted as a new attempt.';
$string['forcejavascript'] = 'Force users to enable JavaScript';
-$string['forcejavascript_desc'] = 'If enabled(recommended) this prevents access to SCORM objects when JavaScript is not supported/enabled in a users browser. If disabled the user may view the SCORM but API communication will fail and no grade information will be saved.';
+$string['forcejavascript_desc'] = 'If enabled (recommended) this prevents access to SCORM objects when JavaScript is not supported/enabled in a users browser. If disabled the user may view the SCORM but API communication will fail and no grade information will be saved.';
$string['forcejavascriptmessage'] = 'JavaScript is required to view this object, please enable JavaScript in your browser and try again.';
$string['found'] = 'Manifest found';
-$string['frameheight'] = 'This preference set the default height for stage frame or window';
-$string['framewidth'] = 'This preference set the default width for stage frame or window';
+$string['frameheight'] = 'The height of the stage frame or window.';
+$string['framewidth'] = 'The width of the stage frame or window.';
$string['fullscreen'] = 'Fill the whole screen';
$string['general'] = 'General data';
$string['gradeaverage'] = 'Average grade';
@@ -144,7 +144,7 @@
* Highest grade - The highest score obtained in all passed learning objects
* Average grade - The mean of all the scores
* Sum grade - The sum of all the scores';
-$string['grademethoddesc'] = 'This preference sets the default grade method for an activity';
+$string['grademethoddesc'] = 'The grading method defines how the grade for a single attempt of the activity is determined.';
$string['gradereported'] = 'Grade reported';
$string['gradesettings'] = 'Grade settings';
$string['gradescoes'] = 'Learning objects';
@@ -153,14 +153,14 @@
$string['hidden'] = 'Hidden';
$string['hidebrowse'] = 'Disable preview mode';
$string['hidebrowse_help'] = 'Preview mode allows a student to browse an activity before attempting it. If preview mode is disabled, the preview button is hidden.';
-$string['hidebrowsedesc'] = 'This preference sets the default for whether to disable or enable the preview mode';
+$string['hidebrowsedesc'] = 'Preview mode allows a student to browse an activity before attempting it.';
$string['hideexit'] = 'Hide exit link';
$string['hidenav'] = 'Hide navigation buttons';
-$string['hidenavdesc'] = 'This preference sets the default for whether to show or hide the navigation buttons';
+$string['hidenavdesc'] = 'Whether to show or hide the navigation buttons.';
$string['hidereview'] = 'Hide review button';
$string['hidetoc'] = 'Display course structure in player';
-$string['hidetoc_help'] = 'This setting specifies how the table of contents is displayed in the SCORM player.';
-$string['hidetocdesc'] = 'This preference sets the default for whether to show or hide the course structure (TOC) in the SCORM player';
+$string['hidetoc_help'] = 'How the table of contents is displayed in the SCORM player';
+$string['hidetocdesc'] = 'This setting specifies how the table of contents is displayed in the SCORM player.';
$string['highestattempt'] = 'Highest attempt';
$string['chooseapacket'] = 'Choose or update a package';
$string['identifier'] = 'Question identifier';
@@ -170,28 +170,28 @@
$string['interactionsid'] = 'Id of the element';
$string['interactionscorrectcount'] = 'Number of correct results for the question';
$string['interactionspattern'] = 'Pattern of correct response';
-$string['interactionslatency'] = 'Time elapsed between the time the interaction <br />was made available to the learner for response <br />and the time of the first response';
-$string['interactionsresponse'] = 'Student\'s Response';
-$string['interactionsresult'] = 'Result based on student\'s response and <br />correct result';
+$string['interactionslatency'] = 'The time elapsed between the time the interaction was made available to the learner for a response and the time of the first response.';
+$string['interactionsresponse'] = 'Student\'s response';
+$string['interactionsresult'] = 'Result based on student\'s response and correct result';
$string['interactionsscoremin'] = 'Minimum value in the range for the raw score';
$string['interactionsscoremax'] = 'Maximum value in the range for the raw score';
-$string['interactionsscoreraw'] = 'Number that reflects the performance of the learner<br /> relative to the range bounded by the values of min and max';
-$string['interactionssuspenddata'] = 'Provides space to store and retrieve data <br />between learner sessions';
-$string['interactionstime'] = 'Time at which the attempt was intiated';
+$string['interactionsscoreraw'] = 'Number that reflects the performance of the learner relative to the range bounded by the values of min and max';
+$string['interactionssuspenddata'] = 'Provides space to store and retrieve data between learner sessions';
+$string['interactionstime'] = 'Time at which the attempt was started';
$string['interactionstype'] = 'Type of question';
$string['interactionsweight'] = 'Weight assigned to the element';
-$string['interactionslearnerresponse'] = 'Learner\'s Response';
-$string['invalidactivity'] = 'Scorm activity is incorrect';
+$string['interactionslearnerresponse'] = 'Learner\'s response';
+$string['invalidactivity'] = 'SCORM activity is incorrect';
$string['invalidurl'] = 'Invalid URL specified';
$string['invalidurlhttpcheck'] = 'Invalid URL specified. Debug message:<pre>{$a->cmsg}</pre>';
-$string['invalidhacpsession'] = 'Invalid HACP Session';
+$string['invalidhacpsession'] = 'Invalid HACP session';
$string['invalidmanifestresource'] = 'WARNING: The following resources were referenced in your manifest but couldn\'t be found:';
$string['last'] = 'Last accessed on';
$string['lastaccess'] = 'Last access';
$string['lastattempt'] = 'Last completed attempt';
$string['lastattemptlock'] = 'Lock after final attempt';
$string['lastattemptlock_help'] = 'If enabled, a student is prevented from launching the SCORM player after using up all their allocated attempts.';
-$string['lastattemptlockdesc'] = 'This preference sets the default value for the lock after final attempt setting';
+$string['lastattemptlockdesc'] = 'If enabled, a student is prevented from launching the SCORM player after using up all their allocated attempts.';
$string['location'] = 'Show the location bar';
$string['max'] = 'Max score';
$string['maximumattempts'] = 'Number of attempts';
@@ -199,9 +199,9 @@
$string['maximumattemptsdesc'] = 'This preference sets the default maximum attempts for an activity';
$string['maximumgradedesc'] = 'This preference sets the default maximum grade for an activity';
$string['menubar'] = 'Show the menu bar';
-$string['min'] = 'Min score';
+$string['min'] = 'Minimum score';
$string['missing_attribute'] = 'Missing attribute {$a->attr} in tag {$a->tag}';
-$string['missingparam'] = 'A required is missing or wrong';
+$string['missingparam'] = 'A required parameter is missing or wrong';
$string['missing_tag'] = 'Missing tag {$a->tag}';
$string['mode'] = 'Mode';
$string['modulename'] = 'SCORM package';
@@ -224,7 +224,7 @@
$string['no_children'] = 'Tag {$a->tag} must have children';
$string['nolimit'] = 'Unlimited attempts';
$string['nomanifest'] = 'Manifest not found';
-$string['noprerequisites'] = 'Sorry but you haven\'t reached enough prerequisites to access this learning object';
+$string['noprerequisites'] = 'Sorry but you don\'t have the required prerequisites to access this activity.';
$string['noreports'] = 'No report to display';
$string['normal'] = 'Normal';
$string['noscriptnoscorm'] = 'Your browser does not support JavaScript or it has JavaScript support disabled. This SCORM package may not play or save data correctly.';
@@ -237,9 +237,9 @@
$string['optnoattemptsonly'] = 'users with no attempts only';
$string['options'] = 'Options (Prevented by some browsers)';
$string['optionsadv'] = 'Options (Advanced)';
-$string['optionsadv_desc'] = 'If checked the window options will be set as advanced options in the form';
-$string['organization'] = 'Organization';
-$string['organizations'] = 'Organizations';
+$string['optionsadv_desc'] = 'If checked the width and height will be listed as advanced settings.';
+$string['organization'] = 'Organisation';
+$string['organizations'] = 'Organisations';
$string['othersettings'] = 'Additional settings';
$string['othertracks'] = 'Other tracks';
$string['page-mod-scorm-x'] = 'Any SCORM module page';
@@ -253,12 +253,12 @@
$string['packageurl_help'] = 'This setting enables a URL for the SCORM package to be specified, rather than choosing a file via the file picker.';
$string['passed'] = 'Passed';
$string['php5'] = 'PHP 5 (DOMXML native library)';
-$string['pluginadministration'] = 'SCORM/AICC administration';
+$string['pluginadministration'] = 'SCORM package administration';
$string['pluginname'] = 'SCORM package';
$string['popup'] = 'New window';
$string['popupmenu'] = 'In a drop down menu';
$string['popupopen'] = 'Open package in a new window';
-$string['popupsblocked'] = 'It appears that popup windows are blocked, stopping this scorm module from playing. Please check your browser settings, before starting again.';
+$string['popupsblocked'] = 'It appears that popup windows are blocked, stopping this SCORM package from playing. Please check your browser settings before trying again.';
$string['position_error'] = 'The {$a->tag} tag can\'t be child of {$a->parent} tag';
$string['preferencesuser'] = 'Preferences for this report';
$string['preferencespage'] = 'Preferences just for this page';
@@ -342,14 +342,13 @@
$string['viewallreports'] = 'View reports for {$a} attempts';
$string['viewalluserreports'] = 'View reports for {$a} users';
$string['whatgrade'] = 'Attempts grading';
-$string['whatgrade_help'] = 'If multiple attempts are allowed, this setting specifies whether the highest, average (mean), first or last completed attempt is recorded in the gradebook.
-The last completed attempt option does not include attempts with a \'failed\' status.
+$string['whatgrade_help'] = 'If multiple attempts are allowed, this setting specifies whether the highest, average (mean), first or last completed attempt is recorded in the gradebook. The last completed attempt option does not include attempts with a \'failed\' status.
-Handling of Multiple Attempts
+Notes on handling of multiple attempts:
* The option to start a new attempt is provided by a checkbox above the Enter button on the content structure page, so be sure you\'re providing access to that page if you want to allow more than one attempt.
-* Some scorm packages are intelligent about new attempts, many are not. What this means is that if the learner re-enters an existing attempt, if the SCORM content does not have internal logic to avoid overwriting previous attempts they can be overwritten, even though the attempt was \'completed\' or \'passed\'.
+* Some SCORM packages are intelligent about new attempts, many are not. What this means is that if the learner re-enters an existing attempt, if the SCORM content does not have internal logic to avoid overwriting previous attempts they can be overwritten, even though the attempt was \'completed\' or \'passed\'.
* The settings "Force completed", "Force new attempt" and "Lock after final attempt" also provide further management of multiple attempts.';
-$string['whatgradedesc'] = 'This preference sets the default attempts grading';
+$string['whatgradedesc'] = 'Whether the highest, average (mean), first or last completed attempt is recorded in the gradebook if multiple attempts are allowed.';
$string['width'] = 'Width';
$string['window'] = 'Window';
View
2  mod/scorm/report/basic/lang/en/scormreport_basic.php
@@ -23,5 +23,5 @@
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
-$string['pluginname'] = 'Basic Report';
+$string['pluginname'] = 'Graph report';
View
2  mod/scorm/report/interactions/lang/en/scormreport_interactions.php
@@ -25,7 +25,7 @@
defined('MOODLE_INTERNAL') || die();
-$string['pluginname'] = 'Interactions Report';
+$string['pluginname'] = 'Interactions report';
$string['questionx'] = 'Question {$a}';
$string['responsex'] = 'Response {$a}';
$string['rightanswerx'] = 'Right answer {$a}';
View
1  mod/url/lang/en/url.php
@@ -37,7 +37,6 @@
* Automatic - The best display option for the URL is selected automatically
* Embed - The URL is displayed within the page below the navigation bar together with the URL description and any blocks
-* Force download - The user is prompted to download the URL file
* Open - Only the URL is displayed in the browser window
* In pop-up - The URL is displayed in a new browser window without menus or an address bar
* In frame - The URL is displayed within a frame below the the navigation bar and URL description
View
1  mod/url/mod_form.php
@@ -127,6 +127,7 @@ function definition() {
$mform->createElement('selectgroups', $variable, '', $options),
);
$mform->addGroup($group, $pargroup, get_string('parameterinfo', 'url'), ' ', false);
+ $mform->setType($parameter, PARAM_RAW);
}
//-------------------------------------------------------
View
1  question/type/calculated/datasetitems_form.php
@@ -183,6 +183,7 @@ protected function definition() {
$answer->answer);
$mform->addElement('text', 'tolerance['.$key.']',
get_string('tolerance', 'qtype_calculated'));
+ $mform->setType('tolerance['.$key.']', PARAM_RAW);
$mform->setAdvanced('tolerance['.$key.']', true);
$mform->addElement('select', 'tolerancetype['.$key.']',
get_string('tolerancetype', 'qtype_numerical'),
View
14 question/type/numerical/edit_numerical_form.php
@@ -145,10 +145,11 @@ protected function add_unit_fields($mform) {
$unitfields = array($mform->createElement('group', 'units',
get_string('unitx', 'qtype_numerical'), $this->unit_group($mform), null, false));
- $repeatedoptions['unit']['disabledif'] =
- array('unitrole', 'eq', qtype_numerical::UNITNONE);
- $repeatedoptions['multiplier']['disabledif'] =
- array('unitrole', 'eq', qtype_numerical::UNITNONE);
+ $repeatedoptions['unit']['disabledif'] = array('unitrole', 'eq', qtype_numerical::UNITNONE);
+ $repeatedoptions['unit']['type'] = PARAM_NOTAGS;
+ $repeatedoptions['multiplier']['disabledif'] = array('unitrole', 'eq', qtype_numerical::UNITNONE);
+ $repeatedoptions['multiplier']['type'] = PARAM_NUMBER;
+
$mform->disabledIf('addunits', 'unitrole', 'eq', qtype_numerical::UNITNONE);
if (isset($this->question->options->units)) {
@@ -184,12 +185,11 @@ protected function add_unit_fields($mform) {
*/
protected function unit_group($mform) {
$grouparray = array();
- $grouparray[] = $mform->createElement('text', 'unit', get_string('unit', 'quiz'),
- array('type'=>PARAM_NOTAGS, 'size'=>10));
+ $grouparray[] = $mform->createElement('text', 'unit', get_string('unit', 'quiz'), array('size'=>10));
$grouparray[] = $mform->createElement('static', '', '', ' ' .
get_string('multiplier', 'quiz').' ');
$grouparray[] = $mform->createElement('text', 'multiplier',
- get_string('multiplier', 'quiz'), array('type'=>PARAM_NUMBER, 'size'=>10));
+ get_string('multiplier', 'quiz'), array('size'=>10));
return $grouparray;
}
View
14 repository/boxnet/lang/en/repository_boxnet.php
@@ -26,14 +26,12 @@
$string['apikey'] = 'API key';
$string['boxnet:view'] = 'View box.net repository';
$string['configplugin'] = 'Box.net configuration';
-$string['callbackurl'] = 'Callback URL';
-$string['callbackurltext'] = '<ol>
-<li>Visit <a href="http://www.box.net/developers/services">box.net developers site</a> again.</li>
-<li>Make sure you set the callback URL of this box.net service to <strong>{$a}</strong></li></ol>';
-$string['callbackwarning'] = '<ol>
-<li>Get a <a href="http://www.box.net/developers/services">box.net API</a> from box.net for this Moodle site.</li>
-<li>Enter box.net api key here, then click Save and then come back to this page. You will see that Moodle has generated a callback URL for you.</li>
-<li>Edit your box.net details on box.net website again and set the callback URL.</li></ol>';
+$string['callbackurl'] = 'Redirect URL';
+$string['callbackurltext'] = '1. Visit <a href="http://www.box.net/developers/services">www.box.net/developers/services</a> again.
+2. Make sure you set the redirect URL of this box.net service to {$a}.';
+$string['callbackwarning'] = '1. Get a Box.net API from <a href="http://www.box.net/developers/services">www.box.net/developers/services</a> for this Moodle site.
+2. Enter the Box.net API key here, then click Save and then return to this page. You will see that Moodle has generated a redirect URL for you.
+3. Edit your Box.net details on the box.net website again and set the redirect URL.';
$string['information'] = 'Get an API key from the <a href="http://www.box.net/developers/services">Box.net developer page</a> for your Moodle site.';
$string['invalidpassword'] = 'Invalid password';
View
4 theme/bootstrapbase/renderers.php
@@ -18,9 +18,9 @@
* Renderers to align Moodle's HTML with that expected by Bootstrap
*
* @package theme_bootstrapbase
- * @copyright 2012
+ * @copyright 2013
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
-require_once('renderers/core.php');
+require_once('renderers/core_renderer.php');
View
0  theme/bootstrapbase/renderers/core.php → theme/bootstrapbase/renderers/core_renderer.php
File renamed without changes
View
2  theme/bootstrapbase/version.php
@@ -19,7 +19,7 @@
*
* @package theme_bootstrapbase
* @copyright 2013 Bas Brands, www.basbrands.nl
- * @authors Bas Brands, David Scotson
+ * @authors Bas Brands, David Scotson
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
View
4 theme/formal_white/lang/en/theme_formal_white.php
@@ -69,7 +69,7 @@
<pre>a:link, a:visited, a:hover, a:active, a:focus {color:blue;}</pre>
Please adjust colors and CSS rules to fit your needs.';
$string['customlogourl'] = 'Custom logo';
-$string['customlogourldesc'] = 'Change the logo for this theme by entering the full or relatve URL to an image you wish to use (i.e. http://www.yoursite.tld/mylogo.png or ../path/to/your/logo.png). As a reference the default logo is 200px wide, 50px high and a transparent png will work best.';
+$string['customlogourldesc'] = 'Change the logo for this theme by entering the full or relative URL to an image you wish to use (i.e. http://www.yoursite.tld/mylogo.png or ../path/to/your/logo.png). As a reference, the default logo is 200px wide, 50px high and a transparent png will work best.';
$string['displayheading'] = 'Display page heading';
$string['displaylogo'] = 'Display logo';
$string['fontsizereference'] = 'Font size reference';
@@ -79,7 +79,7 @@
$string['framemargin'] = 'Frame margin';
$string['framemargindesc'] = 'Room between the frame and the edge of the browser window. (This setting will be ignored if "{$a}" is requested).';
$string['frontpagelogourl'] = 'Custom front page logo';
-$string['frontpagelogourldesc'] = 'Change the logo that is displayed on the front page of your site by entering the full or relatve URL to the image you wish to use (i.e. http://www.yoursite.tld/myfrontpagelogo.png or ../path/to/your/logo.png). This setting overrides the custom logo setting. As a reference the default logo is 300px wide, 80px high and a transparent png will work best.';
+$string['frontpagelogourldesc'] = 'Change the logo that is displayed on the front page of your site by entering the full or relative URL to the image you wish to use. This setting overrides the custom logo setting. As a reference the default logo is 300px wide, 80px high and a transparent png will work best.';
$string['headerbgc'] = 'Header background colour';
$string['headerbgcdesc'] = 'This sets the blocks header background colour for the theme.';
$string['headercontent'] = 'Header content';
View
4 version.php
@@ -29,11 +29,11 @@
defined('MOODLE_INTERNAL') || die();
-$version = 2013051000.00; // YYYYMMDD = weekly release date of this DEV branch
+$version = 2013051300.00; // YYYYMMDD = weekly release date of this DEV branch
// RR = release increments - 00 in DEV branches
// .XX = incremental changes
-$release = '2.5rc1 (Build: 20130510)'; // Human-friendly version name
+$release = '2.5rc1+ (Build: 20130513)';// Human-friendly version name
$branch = '25'; // this version's branch
$maturity = MATURITY_RC; // this version's maturity level
Please sign in to comment.
Something went wrong with that request. Please try again.