MDL-22054 converting block name strings to pluginname

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

diff --git a/blocks/tag_youtube/block_tag_youtube.php b/blocks/tag_youtube/block_tag_youtube.php
index 319e84b..982f579 100644 (file)
--- a/blocks/tag_youtube/block_tag_youtube.php
+++ b/blocks/tag_youtube/block_tag_youtube.php
@@ -8,7 +8,7 @@ define('DEFAULT_NUMBER_OF_VIDEOS', 5);
 class block_tag_youtube extends block_base {
 
     function init() {
-        $this->title = get_string('blockname','block_tag_youtube');
+        $this->title = get_string('pluginname','block_tag_youtube');
         $this->version = 2007101509;
     }
 
@@ -17,7 +17,7 @@ class block_tag_youtube extends block_base {
     }
 
     function specialization() {
-        $this->title = !empty($this->config->title) ? $this->config->title : get_string('blockname', 'block_tag_youtube');
+        $this->title = !empty($this->config->title) ? $this->config->title : get_string('pluginname', 'block_tag_youtube');
         // Convert numeric categories (old YouTube API) to
         // textual ones (new Google Data API)
         $this->config->category = !empty($this->config->category) ? $this->category_map_old2new($this->config->category) : '0';

diff --git a/blocks/tag_youtube/lang/en/block_tag_youtube.php b/blocks/tag_youtube/lang/en/block_tag_youtube.php
index 63a4b73..6f7b097 100644 (file)
--- a/blocks/tag_youtube/lang/en/block_tag_youtube.php
+++ b/blocks/tag_youtube/lang/en/block_tag_youtube.php
@@ -25,7 +25,6 @@
 
 $string['anycategory'] = 'Any Category';
 $string['autosvehicles'] = 'Autos & Vehicles';
-$string['blockname'] = 'Youtube';
 $string['category'] = 'Category';
 $string['comedy'] = 'Comedy';
 $string['configtitle'] = 'Title';
@@ -40,6 +39,7 @@ $string['newspolitics'] = 'News & Politics';
 $string['numberofvideos'] = 'Number of videos';
 $string['peopleblogs'] = 'People & Blogs';
 $string['petsanimals'] = 'Pets & Animals';
+$string['pluginname'] = 'Youtube';
 $string['scienceandtech'] = 'Science & Tech';
 $string['sports'] = 'Sports';
 $string['travel'] = 'Travel & Places';