From: <gi...@ma...> - 2010-01-25 06:28:41
|
The branch, master-1.2.x has been updated via 764989fc444afef0083d9e543ad03f3de22e0bb0 (commit) from 2f42c6a0501ebc7fbe93cbd421614e285b84c455 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 764989fc444afef0083d9e543ad03f3de22e0bb0 Author: David Hicks <hic...@op...> Date: Mon Jan 25 17:27:16 2010 +1100 Fix #11420: 'Loading...' string for AJAX controls isn't translatable The 'Loading...' string within ajax.js should be translatable into different languages. ----------------------------------------------------------------------- Summary of changes: core/html_api.php | 1 + javascript/dev/ajax.js | 2 +- javascript/min/ajax.js | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) ----------------------------------------------------------------------- commit 764989fc444afef0083d9e543ad03f3de22e0bb0 Author: David Hicks <hic...@op...> Date: Mon Jan 25 17:27:16 2010 +1100 Fix #11420: 'Loading...' string for AJAX controls isn't translatable The 'Loading...' string within ajax.js should be translatable into different languages. diff --git a/core/html_api.php b/core/html_api.php index 7ece4da..e2148d3 100644 --- a/core/html_api.php +++ b/core/html_api.php @@ -397,6 +397,7 @@ function html_meta_redirect( $p_url, $p_time = null, $p_sanitize = true ) { function html_head_javascript() { if( ON == config_get( 'use_javascript' ) ) { html_javascript_link( 'common.js' ); + echo '<script language="javascript">var loading_lang = "' . lang_get( 'loading' ) . '";</script>'; html_javascript_link( 'ajax.js' ); global $g_enable_projax; diff --git a/javascript/dev/ajax.js b/javascript/dev/ajax.js index 664f58e..01f8241 100644 --- a/javascript/dev/ajax.js +++ b/javascript/dev/ajax.js @@ -49,7 +49,7 @@ function AjaxLoad( targetElementId, queryString, elementIdToHide ) { liveReq.open("GET", processURI + "?" + queryString); // show "Loading..." while waiting - document.getElementById( targetElementId ).innerHTML = "Loading..."; + document.getElementById( targetElementId ).innerHTML = loading_lang; liveReq.send(null); diff --git a/javascript/min/ajax.js b/javascript/min/ajax.js index bfac1e4..193c00c 100644 --- a/javascript/min/ajax.js +++ b/javascript/min/ajax.js @@ -1 +1 @@ -var processURI="./xmlhttprequest.php";var liveReq=false;if(window.XMLHttpRequest){liveReq=new XMLHttpRequest()}function AjaxLoad(a,c,b){if(liveReq&&liveReq.readyState<4){liveReq.abort()}if(window.XMLHttpRequest){}else{if(window.ActiveXObject){liveReq=new ActiveXObject("Microsoft.XMLHTTP")}}name=this.id;liveReq.onreadystatechange=function(){liveReqProcessReqChange(a,b)};liveReq.open("GET",processURI+"?"+c);document.getElementById(a).innerHTML="Loading...";liveReq.send(null);return false}function liveReqProcessReqChange(a,b){if(liveReq.readyState==4){document.getElementById(a).innerHTML=liveReq.responseText;document.getElementById(b).innerHTML=""}}; \ No newline at end of file +var processURI="./xmlhttprequest.php";var liveReq=false;if(window.XMLHttpRequest){liveReq=new XMLHttpRequest()}function AjaxLoad(a,c,b){if(liveReq&&liveReq.readyState<4){liveReq.abort()}if(window.XMLHttpRequest){}else{if(window.ActiveXObject){liveReq=new ActiveXObject("Microsoft.XMLHTTP")}}name=this.id;liveReq.onreadystatechange=function(){liveReqProcessReqChange(a,b)};liveReq.open("GET",processURI+"?"+c);document.getElementById(a).innerHTML=loading_lang;liveReq.send(null);return false}function liveReqProcessReqChange(a,b){if(liveReq.readyState==4){document.getElementById(a).innerHTML=liveReq.responseText;document.getElementById(b).innerHTML=""}}; ----------------------------------------------------------------------- -- Mantis Bug Tracker |