moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-05 08:56:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'MDL-48798-29' of https://github.com/vadimonus/moodle

Browse source
This commit is contained in:
Dan Poltawski 2015-01-20 17:50:19 +00:00
commit 75a67b0650
2 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

1
lang/en/moodle.php
View file

@ -1898,6 +1898,7 @@ $string['usemessageform'] = 'or use the form below to send a message to the sele
$string['user'] = 'User'; $string['user'] = 'User';
$string['userconfirmed'] = 'Confirmed {$a}'; $string['userconfirmed'] = 'Confirmed {$a}';
$string['usercurrentsettings'] = 'My profile settings'; $string['usercurrentsettings'] = 'My profile settings';
$string['useractivity'] = 'Activity';
$string['userdata'] = 'User data'; $string['userdata'] = 'User data';
$string['userdeleted'] = 'This user account has been deleted'; $string['userdeleted'] = 'This user account has been deleted';
$string['userdescription'] = 'Description'; $string['userdescription'] = 'Description';

4
lib/statslib.php
View file

@ -1242,7 +1242,7 @@ function stats_get_parameters($time,$report,$courseid,$mode,$roleid=0) {
$param->fields = 'sum(stat1+stat2) AS line1'; $param->fields = 'sum(stat1+stat2) AS line1';
$param->stattype = 'activity'; $param->stattype = 'activity';
$param->orderby = 'line1 DESC'; $param->orderby = 'line1 DESC';
$param->line1 = get_string('activity'); $param->line1 = get_string('useractivity');
$param->graphline = 'line1'; $param->graphline = 'line1';
break; break;
@ -1268,7 +1268,7 @@ function stats_get_parameters($time,$report,$courseid,$mode,$roleid=0) {
) enrolments ) enrolments
ON (activity.courseid = enrolments.courseid) ON (activity.courseid = enrolments.courseid)
ORDER BY line3 DESC'; ORDER BY line3 DESC';
$param->line1 = get_string('activity'); $param->line1 = get_string('useractivity');
$param->line2 = get_string('users'); $param->line2 = get_string('users');
$param->line3 = get_string('activityweighted'); $param->line3 = get_string('activityweighted');
$param->graphline = 'line3'; $param->graphline = 'line3';