MDL-22054 converting block name strings to pluginname

AMOS START
 MOV [blockname,block_blog_recent],[pluginname,block_blog_recent]
AMOS END

diff --git a/blocks/blog_recent/block_blog_recent.php b/blocks/blog_recent/block_blog_recent.php
index 99a859a..13a1f69 100644 (file)
--- a/blocks/blog_recent/block_blog_recent.php
+++ b/blocks/blog_recent/block_blog_recent.php
@@ -35,7 +35,7 @@ require_once($CFG->dirroot .'/blog/locallib.php');
 class block_blog_recent extends block_base {
 
     function init() {
-        $this->title = get_string('blockrecenttitle', 'blog');
+        $this->title = get_string('pluginname', 'block_blog_recent');
         $this->content_type = BLOCK_TYPE_TEXT;
         $this->version = 2009070900;
     }

diff --git a/blocks/blog_recent/lang/en/block_blog_recent.php b/blocks/blog_recent/lang/en/block_blog_recent.php
index 6dd905a..2315c56 100644 (file)
--- a/blocks/blog_recent/lang/en/block_blog_recent.php
+++ b/blocks/blog_recent/lang/en/block_blog_recent.php
@@ -23,7 +23,7 @@
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
-$string['blockname'] = 'Recent blog entries';
 $string['norecentblogentries'] = 'No recent entries';
 $string['numentriestodisplay'] = 'Number of recent entries to display';
+$string['pluginname'] = 'Recent blog entries';
 $string['recentinterval'] = 'Interval of time considered "recent"';

diff --git a/lang/en/blog.php b/lang/en/blog.php
index 382f27a..d9f7967 100755 (executable)
--- a/lang/en/blog.php
+++ b/lang/en/blog.php
@@ -35,8 +35,6 @@ $string['associationunviewable'] = 'This entry cannot be viewed by others until
 $string['autotags'] = 'Tags associated with each imported blog entry';
 $string['backupblogshelp'] = 'If enabled then blogs will be included in SITE automated backups';
 $string['blockexternalstitle'] = 'External Blogs';
-$string['blockmenutitle'] = 'Blog Menu';
-$string['blockrecenttitle'] = 'Recent Blog Entries';
 $string['blocktagstitle'] = 'Blog Tags';
 $string['blocktitle'] = 'Blog tags block title';
 $string['blog'] = 'Blog';