MDL-22054 converting block name strings to pluginname

AMOS START
 MOV [blocktagstitle,core_tag],[pluginname,block_tags]
AMOS END

diff --git a/blocks/tags/block_tags.php b/blocks/tags/block_tags.php
index dbd75d4..de0e6c2 100644 (file)
--- a/blocks/tags/block_tags.php
+++ b/blocks/tags/block_tags.php
@@ -3,7 +3,7 @@
 class block_tags extends block_base {
     function init() {
         $this->version = 2008063001;
-        $this->title = get_string('blocktagstitle', 'tag');
+        $this->title = get_string('pluginname', 'block_tags');
         // the cron function goes through all users, so only do daily
         // (this creates rss feeds for personal course tags)
         // removed until rsslib supports dc/cc
@@ -30,7 +30,7 @@ class block_tags extends block_base {
 
         // load userdefined title and make sure it's never empty
         if (empty($this->config->title)) {
-            $this->title = get_string('blocktagstitle','tag');
+            $this->title = get_string('pluginname','block_tags');
         } else {
             $this->title = $this->config->title;
         }

diff --git a/blocks/tags/edit_form.php b/blocks/tags/edit_form.php
index 3a85921..62e16ae 100644 (file)
--- a/blocks/tags/edit_form.php
+++ b/blocks/tags/edit_form.php
@@ -34,9 +34,9 @@ class block_tags_edit_form extends block_edit_form {
         // Fields for editing HTML block title and contents.
         $mform->addElement('header', 'configheader', get_string('blocksettings', 'block'));
 
-        $mform->addElement('text', 'config_title', get_string('blocktagstitle', 'tag'));
+        $mform->addElement('text', 'config_title', get_string('pluginname', 'block_tags'));
         $mform->setType('config_title', PARAM_MULTILANG);
-        $mform->setDefault('config_title', get_string('blocktagstitle', 'tag'));
+        $mform->setDefault('config_title', get_string('pluignname', 'block_tags'));
 
         $numberoftags = array();
         for ($i = 1; $i <= 200; $i++) {

diff --git a/blocks/tags/lang/en/block_tags.php b/blocks/tags/lang/en/block_tags.php
index fe139b6..2fae463 100644 (file)
--- a/blocks/tags/lang/en/block_tags.php
+++ b/blocks/tags/lang/en/block_tags.php
@@ -78,6 +78,7 @@ $string['officialtags'] = 'Official course tags:';
 $string['officialtags1'] = 'official tags';
 $string['officialtags2'] = 'Show official course tags';
 $string['please'] = 'Please';
+$string['pluginname'] = 'Tags';
 $string['select'] = 'Select...';
 $string['showcoursetags'] = 'Show course tags';
 $string['showcoursetagsdef'] = 'Display the course tagging features in the tags block, allowing students to tag courses.';

diff --git a/lang/en/tag.php b/lang/en/tag.php
index 6a8149b..87b58e1 100644 (file)
--- a/lang/en/tag.php
+++ b/lang/en/tag.php
@@ -26,7 +26,6 @@
 $string['addedotag'] = '"{$a}" was added as an official tag.';
 $string['addotags'] = 'Add official tags';
 $string['addtagtomyinterests'] = 'Add "{$a}" to my interests';
-$string['blocktagstitle'] = 'Tags';
 $string['count'] = 'Count';
 $string['delete'] = 'Delete';
 $string['deleted'] = 'Deleted';