Commit bc9cc601 authored by Gerard (Gerry) Caulfield's avatar Gerard (Gerry) Caulfield
Browse files

MDL-29178 Fix block naming inconsistencies

parent 0dde394d
......@@ -36,7 +36,7 @@ require_once($CFG->libdir.'/completionlib.php');
class block_completionstatus extends block_base {
public function init() {
$this->title = get_string('completionstatus', 'block_completionstatus');
$this->title = get_string('pluginname', 'block_completionstatus');
}
public function get_content() {
......
<?php
$string['completionprogressdetails'] = 'Completion progress details';
$string['completionstatus'] = 'Course completion status';
$string['criteriagroup'] = 'Criteria group';
$string['firstofsecond'] = '{$a->first} of {$a->second}';
$string['pluginname'] = 'Course completion status';
......
......@@ -4,7 +4,7 @@ include_once($CFG->dirroot . '/course/lib.php');
class block_course_list extends block_list {
function init() {
$this->title = get_string('courses');
$this->title = get_string('pluginname', 'block_course_list');
}
function has_config() {
......
......@@ -29,4 +29,4 @@ $string['configadminview'] = 'What should the admin see in the course list block
$string['confighideallcourseslink'] = 'Hide "All courses" link at the bottom of the block. Link hiding does not affects Admin\'s view';
$string['hideallcourseslink'] = 'Hide All courses link';
$string['owncourses'] = 'Admin user sees own courses';
$string['pluginname'] = 'Course list';
$string['pluginname'] = 'Courses';
......@@ -27,7 +27,7 @@
class block_private_files extends block_base {
function init() {
$this->title = get_string('myfiles');
$this->title = get_string('pluginname', 'block_private_files');
}
function specialization() {
......
......@@ -24,5 +24,5 @@
*/
$string['managemyfiles'] = 'Manage my files';
$string['pluginname'] = 'User private files';
$string['pluginname'] = 'My private files';
$string['privatefiles'] = 'Private files';
......@@ -26,7 +26,7 @@
class block_rss_client extends block_base {
function init() {
$this->title = get_string('feedstitle', 'block_rss_client');
$this->title = get_string('pluginname', 'block_rss_client');
}
function preferred_width() {
......
......@@ -220,7 +220,7 @@ if ($mform->is_cancelled()) {
$settingsurl = new moodle_url('/admin/settings.php?section=blocksettingrss_client');
$PAGE->navbar->add(get_string('blocks'));
$PAGE->navbar->add(get_string('feedstitle', 'block_rss_client'), $settingsurl);
$PAGE->navbar->add(get_string('pluginname', 'block_rss_client'), $settingsurl);
$PAGE->navbar->add(get_string('managefeeds', 'block_rss_client'));
$PAGE->navbar->add($strtitle);
......
......@@ -52,7 +52,6 @@ $string['feeds'] = 'News feeds';
$string['feedsaddedit'] = 'Add/edit feeds';
$string['feedsconfigurenewinstance'] = 'Click here to configure this block to display RSS feeds.';
$string['feedsconfigurenewinstance2'] = 'Click the edit icon above to configure this block to display RSS feeds.';
$string['feedstitle'] = 'Remote RSS Feeds';
$string['feedupdated'] = 'News feed updated';
$string['feedurl'] = 'Feed URL';
$string['findmorefeeds'] = 'Find more RSS feeds';
......@@ -61,7 +60,7 @@ $string['managefeeds'] = 'Manage all my feeds';
$string['nofeeds'] = 'There are no RSS feeds defined for this site.';
$string['numentries'] = 'Entries per feed';
$string['pickfeed'] = 'Pick a news feed';
$string['pluginname'] = 'RSS client';
$string['pluginname'] = 'Remote RSS feeds';
$string['remotenewsfeed'] = 'Remote news feed';
$string['rss_client:createprivatefeeds'] = 'Create private RSS feeds';
$string['rss_client:createsharedfeeds'] = 'Create shared RSS feeds';
......
......@@ -86,7 +86,7 @@ $PAGE->set_heading($strmanage);
$settingsurl = new moodle_url('/admin/settings.php?section=blocksettingrss_client');
$managefeeds = new moodle_url('/blocks/rss_client/managefeeds.php', $urlparams);
$PAGE->navbar->add(get_string('blocks'));
$PAGE->navbar->add(get_string('feedstitle', 'block_rss_client'), $settingsurl);
$PAGE->navbar->add(get_string('pluginname', 'block_rss_client'), $settingsurl);
$PAGE->navbar->add(get_string('managefeeds', 'block_rss_client'), $managefeeds);
echo $OUTPUT->header();
......
......@@ -74,7 +74,7 @@ $PAGE->set_heading($strviewfeed);
$settingsurl = new moodle_url('/admin/settings.php?section=blocksettingrss_client');
$managefeeds = new moodle_url('/blocks/rss_client/managefeeds.php', $urlparams);
$PAGE->navbar->add(get_string('blocks'));
$PAGE->navbar->add(get_string('feedstitle', 'block_rss_client'), $settingsurl);
$PAGE->navbar->add(get_string('pluginname', 'block_rss_client'), $settingsurl);
$PAGE->navbar->add(get_string('managefeeds', 'block_rss_client'));
$PAGE->navbar->add($strviewfeed);
echo $OUTPUT->header();
......
......@@ -36,7 +36,7 @@ require_once($CFG->libdir.'/completionlib.php');
class block_selfcompletion extends block_base {
public function init() {
$this->title = get_string('selfcompletion', 'block_selfcompletion');
$this->title = get_string('pluginname', 'block_selfcompletion');
}
public function get_content() {
......
......@@ -26,5 +26,4 @@
$string['alreadyselfcompleted'] = 'You have already marked yourself as complete in this course';
$string['completecourse'] = 'Complete course';
$string['pluginname'] = 'Self completion';
$string['selfcompletion'] = 'Self completion';
$string['selfcompletionnotenabled'] = 'The self completion criteria has not been enabled for this course';
Supports Markdown
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