MDL-6544

resolved issue by passing strings into new main.portal.strings for delocalization.

diff --git a/course/format/topics/ajaxcourse-topics.js b/course/format/topics/ajaxcourse-topics.js
index 1371066cae867520b79657df4545d6ba5844303d..bf3676e6568be4809a448a4b946ef8a96a287cb5 100644 (file)
--- a/course/format/topics/ajaxcourse-topics.js
+++ b/course/format/topics/ajaxcourse-topics.js
@@ -43,7 +43,6 @@ function main_class(){
    //this.logview = new YAHOO.widget.LogReader('header'); 
  
 
-        
     this.icons = [];
     this.marker = null;
      
@@ -138,7 +137,7 @@ main_class.prototype.mk_button = function(tag,imgSrc,attributes,imgAttributes){
         var container = document.createElement(tag);
         container.style.cursor = 'pointer';       
         var image = document.createElement('img');
-        image.setAttribute('src',main.portal.wwwroot+imgSrc);          
+        image.setAttribute('src',main.portal.strings['wwwroot']+imgSrc);          
         container.appendChild(image);
         
         if(attributes != null)
@@ -157,7 +156,7 @@ main_class.prototype.connect = function(method,urlStub,callback,body){
         if(callback == null){
             callback = {}
         }
-        return YAHOO.util.Connect.asyncRequest(method,this.portal.wwwroot+"/course/format/topics/commands.php?courseId="+main.portal.id+"&"+urlStub,callback,body);
+        return YAHOO.util.Connect.asyncRequest(method,this.portal.strings['wwwroot']+"/course/format/topics/commands.php?courseId="+main.portal.id+"&"+urlStub,callback,body);
         
 
     } 
@@ -219,6 +218,9 @@ function php_portal_class(){
     
     //flag for week fomat
     this.isWeek = false;
+
+       //strings    
+    this.strings = [];
        
     YAHOO.log("instantiated php_portal_class","info");
 }

diff --git a/lib/ajax/ajaxlib.php b/lib/ajax/ajaxlib.php
index bf00499c92b89ccd05e4df62f0408f0d607ba372..7024f2edd76b2756709825d4d24daff1a2cb2823 100644 (file)
--- a/lib/ajax/ajaxlib.php
+++ b/lib/ajax/ajaxlib.php
@@ -3,7 +3,7 @@
         *   Library functions for using ajax with moodle
         **/
        
-   
+  
    /**
     *Print require statements for javascript libraries
     *Takes in an array of either full paths or shortnames and it will translate them to full paths
@@ -63,11 +63,12 @@
                 $blocksoutput.=",";
         }        
         
-                global $CFG;
+        global $CFG;       
         $output .="<script language='javascript'>\r";
-        $output .=" main.portal.id = ".$id."\r";
+        $output .="    main.portal.id = ".$id."\r";
         $output .="     main.portal.blocks = new Array(".$blocksoutput.");\r";        
-        $output .="     main.portal.wwwroot = '".$CFG->wwwroot."';\r";
+        $output .="     main.portal.strings['wwwroot']='".$CFG->wwwroot."';\r";        
+        $output .="     main.portal.strings['update']='".get_string('update')."';\r";  
         $output .="     onload.load()\r";
         $output .="     main.process_blocks();\r";        
         $output .="</script>";

diff --git a/lib/ajax/section_classes.php b/lib/ajax/section_classes.php
index ff7327ad3be599ee7303f0c241824cfec116a1bf..57cddad47f1bb4bea7e07c1a909ca98a37a3091b 100755 (executable)
--- a/lib/ajax/section_classes.php
+++ b/lib/ajax/section_classes.php
@@ -499,7 +499,7 @@ resource_class.prototype.init_buttons = function(){
        var updateButton = null;
        var buttons =  commandContainer.getElementsByTagName('a');
        for (var x=0;x<buttons.length;x++) {
-            if (buttons[x].title == '<?php print_string('update'); ?>') {
+            if (buttons[x].title == main.portal.strings['update']) {
                 updateButton = buttons[x];
             }
        }