L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'MDL-48798-28' of https://github.com/vadimonus/moodle into MOODLE_28_STABLE

Browse Source
This commit is contained in:
Dan Poltawski
2015-01-20 17:50:24 +00:00
parent 45b68d3cdd 5e25d5630b
commit f11c6059ea
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lang/en/moodle.php
+1
View File
@@ -1897,6 +1897,7 @@ $string['usemessageform'] = 'or use the form below to send a message to the sele
$string['user'] = 'User';
$string['userconfirmed'] = 'Confirmed {$a}';
$string['usercurrentsettings'] = 'My profile settings';
$string['useractivity'] = 'Activity';
$string['userdata'] = 'User data';
$string['userdeleted'] = 'This user account has been deleted';
$string['userdescription'] = 'Description';
lib/statslib.php
+2 -2
View File
@@ -1242,7 +1242,7 @@ function stats_get_parameters($time,$report,$courseid,$mode,$roleid=0) {
$param->fields = 'sum(stat1+stat2) AS line1';
$param->stattype = 'activity';
$param->orderby = 'line1 DESC';
$param->line1 = get_string('activity');
$param->line1 = get_string('useractivity');
$param->graphline = 'line1';
break;
@@ -1268,7 +1268,7 @@ function stats_get_parameters($time,$report,$courseid,$mode,$roleid=0) {
) enrolments
ON (activity.courseid = enrolments.courseid)
ORDER BY line3 DESC';
$param->line1 = get_string('activity');
$param->line1 = get_string('useractivity');
$param->line2 = get_string('users');
$param->line3 = get_string('activityweighted');
$param->graphline = 'line3';