MDL-22054 converting block name strings to pluginname

AMOS START
 MOV [blocktagstitle,core_blog],[pluginname,block_blog_tags]
AMOS END

diff --git a/blocks/blog_tags/block_blog_tags.php b/blocks/blog_tags/block_blog_tags.php
index 424db0d..6ef5a77 100644 (file)
--- a/blocks/blog_tags/block_blog_tags.php
+++ b/blocks/blog_tags/block_blog_tags.php
@@ -9,7 +9,7 @@ require_once($CFG->dirroot .'/blog/lib.php');
 class block_blog_tags extends block_base {
     function init() {
         $this->version = 2007101509;
-        $this->title = get_string('blocktagstitle', 'blog');
+        $this->title = get_string('pluginname', 'block_blog_tags');
     }
 
     function instance_allow_multiple() {
@@ -32,7 +32,7 @@ class block_blog_tags extends block_base {
 
         // load userdefined title and make sure it's never empty
         if (empty($this->config->title)) {
-            $this->title = get_string('blocktagstitle','blog');
+            $this->title = get_string('pluginname', 'block_blog_tags');
         } else {
             $this->title = $this->config->title;
         }

diff --git a/blocks/blog_tags/lang/en/block_blog_tags.php b/blocks/blog_tags/lang/en/block_blog_tags.php
new file mode 100644 (file)
index 0000000..65f6df4
--- /dev/null
+++ b/blocks/blog_tags/lang/en/block_blog_tags.php
@@ -0,0 +1,26 @@
+<?php
+
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * Strings for component 'block_blog_tags', language 'en', branch 'MOODLE_20_STABLE'
+ *
+ * @package   block_blog_tags
+ * @copyright 1999 onwards Martin Dougiamas  {@link http://moodle.com}
+ * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+$string['pluginname'] = 'Blog Tags';

diff --git a/lang/en/blog.php b/lang/en/blog.php
index d9f7967..cc7b7a7 100755 (executable)
--- a/lang/en/blog.php
+++ b/lang/en/blog.php
@@ -35,7 +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['blocktagstitle'] = 'Blog Tags';
 $string['blocktitle'] = 'Blog tags block title';
 $string['blog'] = 'Blog';
 $string['blogaboutthis'] = 'Blog about this {$a->type}';