mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-17 14:35:29 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-53988-master-fix' of https://github.com/xow/moodle

Browse Source
This commit is contained in:
Andrew Nicols 2016-05-19 11:58:16 +08:00
commit 9dfee70f6b
2 changed files with 2 additions and 1 deletions
mod/lti
lang/en
lti.php
locallib.php

1
mod/lti/lang/en/lti.php

@ -63,6 +63,7 @@ Some tool providers support reporting grades back to Moodle based on actions tak
Note that this setting may be overridden in the tool configuration.';
$string['action'] = 'Action';
$string['activate'] = 'Activate';
$string['activatetoadddescription'] = 'You will need to activate this tool before you can add a description.';
$string['active'] = 'Active';
$string['activity'] = 'Activity';
$string['addnewapp'] = 'Enable external application';

2
mod/lti/locallib.php

@ -2499,7 +2499,7 @@ function serialise_tool_proxy(stdClass $proxy) {
return array(
'id' => $proxy->id,
'name' => $proxy->name,
'description' => $proxy->regurl . ' You will need to activate this proxy before adding a description',
'description' => get_string('activatetoadddescription', 'mod_lti'),
'urls' => get_tool_proxy_urls($proxy),
'state' => array(
'text' => get_string('pending', 'mod_lti'),