Merge branch 'wip_m_MDL-29178_fix_block_naming_inconsistencies' of gi…

…t://github.com/gerrywastaken/moodle

blocks/completionstatus/block_completionstatus.php

@@ -36,7 +36,7 @@
 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() {

blocks/completionstatus/lang/en/block_completionstatus.php

@@ -1,7 +1,6 @@
 <?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';

blocks/course_list/block_course_list.php

@@ -4,7 +4,7 @@
 
 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() {

blocks/course_list/lang/en/block_course_list.php

@@ -29,4 +29,4 @@
 $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';

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() {

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';

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() {

blocks/rss_client/editfeed.php

@@ -220,7 +220,7 @@ public static function autodiscover_feed_url($url){
 
     $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);
 

blocks/rss_client/lang/en/block_rss_client.php

@@ -52,7 +52,6 @@
 $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['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';

blocks/rss_client/managefeeds.php

@@ -86,7 +86,7 @@
 $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();
 

blocks/rss_client/viewfeed.php

@@ -74,7 +74,7 @@
 $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();

blocks/selfcompletion/block_selfcompletion.php

@@ -36,7 +36,7 @@
 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() {

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';