MDL-22054 converting block name strings to pluginname

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

diff --git a/blocks/settings_navigation_tree/block_settings_navigation_tree.php b/blocks/settings_navigation_tree/block_settings_navigation_tree.php
index d46081e..1b8b2a5 100644 (file)
--- a/blocks/settings_navigation_tree/block_settings_navigation_tree.php
+++ b/blocks/settings_navigation_tree/block_settings_navigation_tree.php
@@ -49,7 +49,7 @@ class block_settings_navigation_tree extends block_tree {
      */
     function init() {
         $this->blockname = get_class($this);
      */
     function init() {
         $this->blockname = get_class($this);

-        $this->title = get_string('blockname', $this->blockname);
+        $this->title = get_string('pluginname', $this->blockname);

         $this->version = 2009082800;
     }
 
         $this->version = 2009082800;
     }
 

diff --git a/blocks/settings_navigation_tree/lang/en/block_settings_navigation_tree.php b/blocks/settings_navigation_tree/lang/en/block_settings_navigation_tree.php
index b06ad86..0ff92ad 100644 (file)
--- a/blocks/settings_navigation_tree/lang/en/block_settings_navigation_tree.php
+++ b/blocks/settings_navigation_tree/lang/en/block_settings_navigation_tree.php
@@ -23,6 +23,6 @@
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 

-$string['blockname'] = 'Settings';

 $string['enablehoverexpansion'] = 'Enable mouseover expansion of this block';
 $string['enablesidebarpopout'] = 'Allow the user to switch the block to a sidbar popout';
 $string['enablehoverexpansion'] = 'Enable mouseover expansion of this block';
 $string['enablesidebarpopout'] = 'Allow the user to switch the block to a sidbar popout';

+$string['pluginname'] = 'Settings';