MDL-22054 converting block name strings to pluginname

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

diff --git a/blocks/global_navigation_tree/block_global_navigation_tree.php b/blocks/global_navigation_tree/block_global_navigation_tree.php
index 9f501ab..b9ceec9 100644 (file)
--- a/blocks/global_navigation_tree/block_global_navigation_tree.php
+++ b/blocks/global_navigation_tree/block_global_navigation_tree.php
@@ -51,7 +51,7 @@ class block_global_navigation_tree extends block_tree {
     function init() {
         global $CFG;
         $this->blockname = get_class($this);
-        $this->title = get_string('blockname', $this->blockname);
+        $this->title = get_string('pluginname', $this->blockname);
         $this->version = 2009082800;
     }
 

diff --git a/blocks/global_navigation_tree/lang/en/block_global_navigation_tree.php b/blocks/global_navigation_tree/lang/en/block_global_navigation_tree.php
index 60dcc3b..bfe1eb4 100644 (file)
--- a/blocks/global_navigation_tree/lang/en/block_global_navigation_tree.php
+++ b/blocks/global_navigation_tree/lang/en/block_global_navigation_tree.php
@@ -23,7 +23,6 @@
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
-$string['blockname'] = 'Navigation';
 $string['courseactivities'] = 'Categories, courses, and course Activities';
 $string['courses'] = 'Categories and courses';
 $string['coursestructures'] = 'Categories, courses, and course structures';
@@ -31,6 +30,7 @@ $string['enablehoverexpansiondesc'] = 'Enable mouseover expansion of this block'
 $string['enablesidebarpopoutdesc'] = 'Allow the user to switch the block to a sidbar popout';
 $string['everything'] = 'Everything';
 $string['expansionlimit'] = 'Generate navigation for the following';
+$string['pluginname'] = 'Navigation';
 $string['showemptybranchesdesc'] = 'Show empty course section branches';
 $string['showmycoursesdesc'] = 'Show my courses in the navigation';
 $string['showmyhistorydesc'] = 'Show my history as a branch in the navigation';