WP Merge

git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@469 7be80a69-a1ef-0310-a953-fb0f7c49ff36

1 files changed, 12 insertions, 12 deletions

diff --git a/wp-inst/wp-admin/admin-header.php b/wp-inst/wp-admin/admin-header.php
index b9bbeb6..7ac2a48 100644
--- a/wp-inst/wp-admin/admin-header.php
+++ b/wp-inst/wp-admin/admin-header.php
@@ -13,11 +13,11 @@ if (!isset($_GET["page"])) require_once('admin.php'); ?>
 //<![CDATA[
 
 function addLoadEvent(func) {
-  var oldonload = window.onload;
-  if (typeof window.onload != 'function') {
-    window.onload = func;
+  if ( typeof wpOnload != 'function' ) {
+    wpOnload = func;
   } else {
-    window.onload = function() {
+    var oldonload = wpOnload;
+    wpOnload = function() {
       oldonload();
       func();
     }
@@ -80,7 +80,7 @@ addLoadEvent(blurry);
 <script type="text/javascript" src="list-manipulation.js"></script>
 <?php if ( isset( $editing ) ) : ?>
 <?php if ( $editing && user_can_richedit() ) : ?>
-<script language="javascript" type="text/javascript" src="../wp-includes/js/tinymce/tiny_mce_gzip.php?ver=20051211"></script>
+<script type="text/javascript" src="../wp-includes/js/tinymce/tiny_mce_gzip.php?ver=20051211"></script>
 <?php endif; ?>
 <script type="text/javascript" src="../wp-includes/js/dbx.js"></script>
 <script type="text/javascript" src="../wp-includes/js/dbx-key.js"></script>
@@ -133,7 +133,7 @@ function newCatAddIn() {
 	newcatSub.type = 'button';
 	newcatSub.name = 'Button';
 	newcatSub.id = 'catadd';
-	newcatSub.value = '<?php _e('Add'); ?>';
+	newcatSub.value = '<?php echo addslashes(__('Add')); ?>';
 	newcatSub.onclick = ajaxNewCat;
 
 	var searchResult = document.createElement( 'div' );
@@ -152,7 +152,7 @@ function newCatAddIn() {
 	document.getElementById('jaxcat').appendChild(ajaxcat);
 
 	howto = document.createElement('span');
-	howto.innerHTML = '<?php _e('Separate multiple categories with commas.'); ?>';
+	howto.innerHTML = '<?php echo addslashes(__('Separate multiple categories with commas.')); ?>';
 	howto.id = 'howto';
 	ajaxcat.appendChild(howto);
 }
@@ -171,17 +171,17 @@ function getResponseElement() {
 
 function newCatLoading() {
 	var p = getResponseElement();
-	p.innerHTML = 'Sending Data...';
+	p.innerHTML = '<?php echo addslashes(__('Sending Data...')); ?>';
 }
 
 function newCatLoaded() {
 	var p = getResponseElement();
-	p.innerHTML = 'Data Sent...';
+	p.innerHTML = '<?php echo addslashes(__('Data Sent...')); ?>';
 }
 
 function newCatInteractive() {
 	var p = getResponseElement();
-	p.innerHTML = 'Processing Request...';
+	p.innerHTML = '<?php echo addslashes(__('Processing Request...')); ?>';
 }
 
 function newCatCompletion() {
@@ -197,11 +197,11 @@ function newCatCompletion() {
 		id = ids[i];
 //		alert(id);
 		if ( id == '-1' ) {
-			p.innerHTML = "You don't have permission to do that.";
+			p.innerHTML = "<?php echo addslashes(__("You don't have permission to do that.")); ?>";
 			return;
 		}
 		if ( id == '0' ) {
-			p.innerHTML = "That category name is invalid.  Try something else.";
+			p.innerHTML = "<?php echo addslashes(__('That category name is invalid.  Try something else.')); ?>";
 			return;
 		}