diff --git a/blocks/completionstatus/block_completionstatus.php b/blocks/completionstatus/block_completionstatus.php index 7013b1292ce..07a7b473a6c 100644 --- a/blocks/completionstatus/block_completionstatus.php +++ b/blocks/completionstatus/block_completionstatus.php @@ -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() { diff --git a/blocks/completionstatus/lang/en/block_completionstatus.php b/blocks/completionstatus/lang/en/block_completionstatus.php index 50bea4e88d1..fcc965ac7fd 100644 --- a/blocks/completionstatus/lang/en/block_completionstatus.php +++ b/blocks/completionstatus/lang/en/block_completionstatus.php @@ -1,7 +1,6 @@ first} of {$a->second}'; $string['pluginname'] = 'Course completion status'; diff --git a/blocks/course_list/block_course_list.php b/blocks/course_list/block_course_list.php index 3c773a63e2a..282f9e22d07 100644 --- a/blocks/course_list/block_course_list.php +++ b/blocks/course_list/block_course_list.php @@ -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() { diff --git a/blocks/course_list/lang/en/block_course_list.php b/blocks/course_list/lang/en/block_course_list.php index a30a5c01fe9..4e79fc13a4b 100644 --- a/blocks/course_list/lang/en/block_course_list.php +++ b/blocks/course_list/lang/en/block_course_list.php @@ -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'; diff --git a/blocks/private_files/block_private_files.php b/blocks/private_files/block_private_files.php index 32e1282e5b3..594f27600f5 100644 --- a/blocks/private_files/block_private_files.php +++ b/blocks/private_files/block_private_files.php @@ -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() { diff --git a/blocks/private_files/lang/en/block_private_files.php b/blocks/private_files/lang/en/block_private_files.php index f13e21fcf5e..e3970e6fa3b 100644 --- a/blocks/private_files/lang/en/block_private_files.php +++ b/blocks/private_files/lang/en/block_private_files.php @@ -24,5 +24,5 @@ */ $string['managemyfiles'] = 'Manage my files'; -$string['pluginname'] = 'User private files'; +$string['pluginname'] = 'My private files'; $string['privatefiles'] = 'Private files'; diff --git a/blocks/rss_client/block_rss_client.php b/blocks/rss_client/block_rss_client.php index 8ca1504f974..a3aa5114f7b 100644 --- a/blocks/rss_client/block_rss_client.php +++ b/blocks/rss_client/block_rss_client.php @@ -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() { diff --git a/blocks/rss_client/editfeed.php b/blocks/rss_client/editfeed.php index 57119170275..d25e090769d 100644 --- a/blocks/rss_client/editfeed.php +++ b/blocks/rss_client/editfeed.php @@ -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); diff --git a/blocks/rss_client/lang/en/block_rss_client.php b/blocks/rss_client/lang/en/block_rss_client.php index aa809efb95c..33ca8175a12 100644 --- a/blocks/rss_client/lang/en/block_rss_client.php +++ b/blocks/rss_client/lang/en/block_rss_client.php @@ -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'; diff --git a/blocks/rss_client/managefeeds.php b/blocks/rss_client/managefeeds.php index 553a6193255..321aed4d7a1 100644 --- a/blocks/rss_client/managefeeds.php +++ b/blocks/rss_client/managefeeds.php @@ -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(); diff --git a/blocks/rss_client/viewfeed.php b/blocks/rss_client/viewfeed.php index ef8da2944bc..469e621283a 100644 --- a/blocks/rss_client/viewfeed.php +++ b/blocks/rss_client/viewfeed.php @@ -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(); diff --git a/blocks/selfcompletion/block_selfcompletion.php b/blocks/selfcompletion/block_selfcompletion.php index 9954a394437..9fe4a84b373 100644 --- a/blocks/selfcompletion/block_selfcompletion.php +++ b/blocks/selfcompletion/block_selfcompletion.php @@ -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() { diff --git a/blocks/selfcompletion/lang/en/block_selfcompletion.php b/blocks/selfcompletion/lang/en/block_selfcompletion.php index 03cf0dc032d..403d0b2f2a7 100644 --- a/blocks/selfcompletion/lang/en/block_selfcompletion.php +++ b/blocks/selfcompletion/lang/en/block_selfcompletion.php @@ -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';