Commit d213feab authored by Kristina Hoeppner's avatar Kristina Hoeppner
Browse files

Change "Recent activity" to "Inbox" (Bug #1030161)



The default block title will then be called the
same as the block to avoid confusion.

Change-Id: I9db493f541a0f894e4ff68f3e556cceb712a8dd6
Signed-off-by: Kristina Hoeppner's avatarKristina D.C. Hoeppner <kristina@catalyst.net.nz>
parent 0e05cabf
......@@ -166,7 +166,7 @@ class PluginBlocktypeInbox extends SystemBlocktype {
* We need a default title for this block, so that the inbox blocks
* on the dashboard are translatable.
*
* To maintain existing behaviour, use the 'recentactivity' string unless
* To maintain existing behaviour, use the 'inboxblocktitle' string unless
* the block has only got forum post notifications in it, in which case
* use 'topicsimfollowing'
*/
......@@ -174,14 +174,14 @@ class PluginBlocktypeInbox extends SystemBlocktype {
if ($configdata = $instance->get('configdata')) {
foreach ($configdata as $k => $v) {
if ($v && $k != 'newpost' && $k != 'maxitems') {
return get_string('recentactivity');
return get_string('inboxblocktitle');
}
}
if ($configdata['newpost']) {
return get_string('topicsimfollowing');
}
}
return get_string('recentactivity');
return get_string('inboxblocktitle');
}
}
......@@ -996,7 +996,7 @@ $string['editdashboard'] = 'Edit';
$string['usersdashboard'] = "%s's dashboard";
$string['dashboarddescription'] = 'Your dashboard page is what you see on the homepage when you first log in. Only you have access to it';
$string['topicsimfollowing'] = "Topics I'm following";
$string['recentactivity'] = 'Recent activity';
$string['inboxblocktitle'] = 'Inbox';
$string['mymessages'] = 'My messages';
$string['pleasedonotreplytothismessage'] = "Please do not reply to this message.";
......
......@@ -1729,7 +1729,7 @@ function xmldb_core_upgrade($oldversion=0) {
),
array(
'blocktype' => 'inbox',
'title' => get_string('recentactivity'),
'title' => get_string('inboxblocktitle'),
'column' => 2,
'config' => array(
'feedback' => true,
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment