Changeset 4970

Timestamp:

03/06/2007 05:35:01 PM (20 years ago)

Author:

ryan

Message:

JS localization from mdawaffe. fixes #3913

Location:

trunk

Files:

• wp-admin/cat.js (moved) (moved from trunk/wp-admin/cat-js.php ) (2 diffs)
• wp-admin/dbx-admin-key.js (moved) (moved from trunk/wp-admin/dbx-admin-key-js.php ) (4 diffs)
• wp-admin/upload.js (moved) (moved from trunk/wp-admin/upload-js.php ) (7 diffs)
• wp-includes/js/autosave.js (moved) (moved from trunk/wp-includes/js/autosave-js.php ) (7 diffs)
• wp-includes/js/list-manipulation.js (modified) (2 diffs)
• wp-includes/js/wp-ajax.js (moved) (moved from trunk/wp-includes/js/wp-ajax-js.php ) (6 diffs)
• wp-includes/script-loader.php (modified) (3 diffs)

trunk/wp-admin/cat.js

@@ -1 @@
-<?php
-require_once('../wp-config.php');
-cache_javascript_headers();
-?>
 addLoadEvent(function(){catList=new listMan('categorychecklist');catList.ajaxRespEl='jaxcat';catList.topAdder=1;catList.alt=0;catList.showLink=0;});
 addLoadEvent(newCatAddIn);
@@ -9 +5 @@
         if ( !jaxcat )
                 return false;
-        Element.update(jaxcat,'<span id="ajaxcat"><input type="text" name="newcat" id="newcat" size="16" autocomplete="off"/><input type="button" name="Button" id="catadd" value="<?php echo js_escape(__('Add')); ?>"/><span id="howto"><?php echo js_escape(__('Separate multiple categories with commas.')); ?></span></span>');
+        Element.update(jaxcat,'<span id="ajaxcat"><input type="text" name="newcat" id="newcat" size="16" autocomplete="off"/><input type="button" name="Button" id="catadd" value="' + catL10n.add + '"/><span id="howto">' + catL10n.how + '</span></span>');
         $('newcat').onkeypress = function(e) { return killSubmit("catList.ajaxAdder('category','jaxcat');", e); };
         $('catadd').onclick = function() { catList.ajaxAdder('category', 'jaxcat'); };

trunk/wp-admin/dbx-admin-key.js

@@ -1 @@
-<?php
-require_once('admin.php');
-cache_javascript_headers();
-
-switch ( $_GET['pagenow'] ) :
-        case 'post.php' :
-        case 'post-new.php' :
-                $man = 'postmeta';
-                break;
-        case 'page.php' :
-        case 'page-new.php' :
-                $man = 'pagemeta';
-                break;
-        case 'link.php' :
-                $man = 'linkmeta';
-                break;
-        default:
-                exit;
-                break;
-endswitch;
-?>
-addLoadEvent( function() {var manager = new dbxManager('<?php echo $man; ?>');} );
+addLoadEvent( function() {var manager = new dbxManager( dbxL10n.mananger );} );
 
 addLoadEvent( function()
@@ -27 +6 @@
         var meta = new dbxGroup(
                 'grabit',               // container ID [/-_a-zA-Z0-9/]
-                'vertical',     // orientation ['vertical'|'horizontal']
+                'vertical',             // orientation ['vertical'|'horizontal']
                 '10',                   // drag threshold ['n' pixels]
                 'no',                   // restrict drag movement to container axis ['yes'|'no']
@@ -33 +12 @@
                 'yes',                  // include open/close toggle buttons ['yes'|'no']
                 'closed',               // default state ['open'|'closed']
-                '<?php echo js_escape(__('open')); ?>',                 // word for "open", as in "open this box"
-                '<?php echo js_escape(__('close')); ?>',                // word for "close", as in "close this box"
-                '<?php echo js_escape(__('click-down and drag to move this box')); ?>', // sentence for "move this box" by mouse
-                '<?php echo js_escape(__('click to %toggle% this box')); ?>', // pattern-match sentence for "(open|close) this box" by mouse
-                '<?php echo js_escape(__('use the arrow keys to move this box')); ?>', // sentence for "move this box" by keyboard
-                '<?php echo js_escape(__(', or press the enter key to %toggle% it')); ?>',  // pattern-match sentence-fragment for "(open|close) this box" by keyboard
+                dbxL10n.open,           // word for "open", as in "open this box"
+                dbxL10n.close,          // word for "close", as in "close this box"
+                dbxL10n.moveMouse,      // sentence for "move this box" by mouse
+                dbxL10n.toggleMouse,    // pattern-match sentence for "(open|close) this box" by mouse
+                dbxL10n.moveKey,        // sentence for "move this box" by keyboard
+                dbxL10n.toggleKey,      // pattern-match sentence-fragment for "(open|close) this box" by keyboard
                 '%mytitle%  [%dbxtitle%]' // pattern-match syntax for title-attribute conflicts
                 );
@@ -51 +30 @@
 
         var advanced = new dbxGroup(
-                'advancedstuff',                // container ID [/-_a-zA-Z0-9/]
-                'vertical',             // orientation ['vertical'|'horizontal']
-                '10',                   // drag threshold ['n' pixels]
+                'advancedstuff',
+                'vertical',
+                '10',
                 'yes',                  // restrict drag movement to container axis ['yes'|'no']
-                '10',                   // animate re-ordering [frames per transition, or '0' for no effect]
-                'yes',                  // include open/close toggle buttons ['yes'|'no']
-                'closed',               // default state ['open'|'closed']
-                '<?php echo js_escape(__('open')); ?>',                 // word for "open", as in "open this box"
-                '<?php echo js_escape(__('close')); ?>',                // word for "close", as in "close this box"
-                '<?php echo js_escape(__('click-down and drag to move this box')); ?>', // sentence for "move this box" by mouse
-                '<?php echo js_escape(__('click to %toggle% this box')); ?>', // pattern-match sentence for "(open|close) this box" by mouse
-                '<?php echo js_escape(__('use the arrow keys to move this box')); ?>', // sentence for "move this box" by keyboard
-                '<?php echo js_escape(__(', or press the enter key to %toggle% it')); ?>',  // pattern-match sentence-fragment for "(open|close) this box" by keyboard
+                '10',
+                'yes',
+                'closed',
+                dbxL10n.open,
+                dbxL10n.close,
+                dbxL10n.moveMouse,
+                dbxL10n.toggleMouse,
+                dbxL10n.moveKey,
+                dbxL10n.toggleKey,
                 '%mytitle%  [%dbxtitle%]' // pattern-match syntax for title-attribute conflicts
                 );

trunk/wp-admin/upload.js

@@ -1 @@
-<?php require_once('admin.php'); cache_javascript_headers(); ?>
 addLoadEvent( function() {
         theFileList = {
@@ -70 +69 @@
                                 params.ID = '';
                                 params.action = '';
-                                h += "<a href='" + this.urlData[0] + '?' + params.toQueryString() + "' title='<?php echo attribute_escape(__('Browse your files')); ?>' class='back'><?php echo attribute_escape(__('&laquo; Back')); ?></a>";
-                        } else {
-                                h += "<a href='#' onclick='return theFileList.cancelView();'  title='<?php echo attribute_escape(__('Browse your files')); ?>' class='back'><?php echo attribute_escape(__('&laquo; Back')) ?></a>";
-                        }
+                                h += "<a href='" + this.urlData[0] + '?' + params.toQueryString() + "'";
+                        } else {
+                                h += "<a href='#' onclick='return theFileList.cancelView();'";
+                        }
+                        h += " title='" + this.browseTitle + "' class='back'>" + this.back + "</a>";
                         h += "<div id='file-title'>"
                         if ( 0 == this.currentImage.isImage )
-                                h += "<h2><a href='" + this.currentImage.srcBase + this.currentImage.src + "' onclick='return false;' title='<?php echo attribute_escape(__('Direct link to file')); ?>'>" + this.currentImage.title + "</a></h2>";
+                                h += "<h2><a href='" + this.currentImage.srcBase + this.currentImage.src + "' onclick='return false;' title='" + this.directTitle + "'>" + this.currentImage.title + "</a></h2>";
                         else
                                 h += "<h2>" + this.currentImage.title + "</h2>";
                         h += " &#8212; <span>";
-                        h += "<a href='#' onclick='return theFileList.editView(" + id + ");'><?php echo attribute_escape(__('Edit')); ?></a>"
+                        h += "<a href='#' onclick='return theFileList.editView(" + id + ");'>" + this.edit + "</a>"
                         h += "</span>";
                         h += '</div>'
                         h += "<div id='upload-file-view' class='alignleft'>";
                         if ( 1 == this.currentImage.isImage ) {
-                                h += "<a href='" + this.currentImage.srcBase + this.currentImage.src + "' onclick='return false;' title='<?php echo attribute_escape(__('Direct link to file')); ?>'>";
+                                h += "<a href='" + this.currentImage.srcBase + this.currentImage.src + "' onclick='return false;' title='" + this.directTitle + "'>";
                                 h += "<img src='" + ( this.currentImage.thumb ? this.currentImage.thumb : this.currentImage.src ) + "' alt='" + this.currentImage.title + "' width='" + this.currentImage.width + "' height='" + this.currentImage.height + "' />";
                                 h += "</a>";
@@ -99 +99 @@
                                 checked = 'display-full';
                                 if ( this.currentImage.thumb ) {
-                                        display.push("<label for='display-thumb'><input type='radio' name='display' id='display-thumb' value='thumb' /> <?php echo attribute_escape(__('Thumbnail')); ?></label><br />");
+                                        display.push("<label for='display-thumb'><input type='radio' name='display' id='display-thumb' value='thumb' /> " + this.thumb + "</label><br />");
                                         checked = 'display-thumb';
                                 }
-                                display.push("<label for='display-full'><input type='radio' name='display' id='display-full' value='full' /> <?php echo attribute_escape(__('Full size')); ?></label>");
+                                display.push("<label for='display-full'><input type='radio' name='display' id='display-full' value='full' /> " + this.full + "</label>");
                         } else if ( this.currentImage.thumb ) {
-                                display.push("<label for='display-thumb'><input type='radio' name='display' id='display-thumb' value='thumb' /> <?php echo attribute_escape(__('Icon')); ?></label>");
+                                display.push("<label for='display-thumb'><input type='radio' name='display' id='display-thumb' value='thumb' /> " + this.icon + "</label>");
                         }
                         if ( display.length ) {
-                                display.push("<br /><label for='display-title'><input type='radio' name='display' id='display-title' value='title' /> <?php echo attribute_escape(__('Title')); ?></label>");
-                                h += "<tr><th style='padding-bottom:.5em'><?php echo attribute_escape(__('Show:')); ?></th><td style='padding-bottom:.5em'>";
+                                display.push("<br /><label for='display-title'><input type='radio' name='display' id='display-title' value='title' /> " + this.title + "</label>");
+                                h += "<tr><th style='padding-bottom:.5em'>" + this.show + "</th><td style='padding-bottom:.5em'>";
                                 $A(display).each( function(i) { h += i; } );
                                 h += "</td></tr>";
                         }
 
-                        h += "<tr><th><?php echo attribute_escape(__('Link to:')); ?></th><td>";
-                        h += "<label for='link-file'><input type='radio' name='link' id='link-file' value='file' checked='checked'/> <?php echo attribute_escape(__('File')); ?></label><br />";
-                        h += "<label for='link-page'><input type='radio' name='link' id='link-page' value='page' /> <?php echo attribute_escape(__('Page')); ?></label><br />";
-                        h += "<label for='link-none'><input type='radio' name='link' id='link-none' value='none' /> <?php echo attribute_escape(__('None')); ?></label>";
+                        h += "<tr><th>" + this.link + "</th><td>";
+                        h += "<label for='link-file'><input type='radio' name='link' id='link-file' value='file' checked='checked'/> " + this.file + "</label><br />";
+                        h += "<label for='link-page'><input type='radio' name='link' id='link-page' value='page' /> " + this.page + "</label><br />";
+                        h += "<label for='link-none'><input type='radio' name='link' id='link-none' value='none' /> " + this.none + "</label>";
                         h += "</td></tr>";
 
                         h += "<tr><td colspan='2'><p class='submit'>";
-                        h += "<input type='button' class='button' name='send' onclick='theFileList.sendToEditor(" + id + ")' value='<?php echo attribute_escape(__('Send to editor &raquo;')); ?>' />";
+                        h += "<input type='button' class='button' name='send' onclick='theFileList.sendToEditor(" + id + ")' value='" + this.editorText + "' />";
                         h += "</p></td></tr></table>";
                         h += "</form>";
@@ -148 +148 @@
                                 params.ID = '';
                                 params.action = '';
-                                h += "<a href='" + this.urlData[0] + '?' + params.toQueryString() + "'  title='<?php echo attribute_escape(__('Browse your files')); ?>' class='back'><?php echo attribute_escape(__('&laquo; Back')); ?></a>";
-                        } else {
-                                h += "<a href='#' onclick='return theFileList.cancelView();'  title='<?php echo attribute_escape(__('Browse your files')); ?>' class='back'><?php echo attribute_escape(__('&laquo; Back')); ?></a>";
-                        }
+                                h += "<a href='" + this.urlData[0] + '?' + params.toQueryString() + "'";
+                        } else {
+                                h += "<a href='#' onclick='return theFileList.cancelView();'";
+                        }
+                        h += " title='" + this.browseTitle + "' class='back'>" + this.back + "</a>";
                         h += "<div id='file-title'>"
                         if ( 0 == this.currentImage.isImage )
-                                h += "<h2><a href='" + this.currentImage.srcBase + this.currentImage.src + "' onclick='return false;' title='<?php echo attribute_escape(__('Direct link to file')); ?>'>" + this.currentImage.title + "</a></h2>";
+                                h += "<h2><a href='" + this.currentImage.srcBase + this.currentImage.src + "' onclick='return false;' title='" + this.directTitle + "'>" + this.currentImage.title + "</a></h2>";
                         else
                                 h += "<h2>" + this.currentImage.title + "</h2>";
                         h += " &#8212; <span>";
-                        h += "<a href='#' onclick='return theFileList.imageView(" + id + ");'><?php echo attribute_escape(__('Insert')); ?></a>"
+                        h += "<a href='#' onclick='return theFileList.imageView(" + id + ");'>" + this.insert + "</a>";
                         h += "</span>";
                         h += '</div>'
                         h += "<div id='upload-file-view' class='alignleft'>";
                         if ( 1 == this.currentImage.isImage ) {
-                                h += "<a href='" + this.currentImage.srcBase + this.currentImage.src + "' onclick='return false;' title='<?php echo wp_specialchars(__('Direct link to file')); ?>'>";
+                                h += "<a href='" + this.currentImage.srcBase + this.currentImage.src + "' onclick='return false;' title='" + this.directTitle + "'>";
                                 h += "<img src='" + ( this.currentImage.thumb ? this.currentImage.thumb : this.currentImage.src ) + "' alt='" + this.currentImage.title + "' width='" + this.currentImage.width + "' height='" + this.currentImage.height + "' />";
                                 h += "</a>";
@@ -171 +172 @@
 
 
-                        h += "<table><col /><col class='widefat' /><tr>"
-                        h += "<th scope='row'><label for='url'><?php echo attribute_escape(__('URL')); ?></label></th>";
+                        h += "<table><col /><col class='widefat' /><tr>";
+                        h += "<th scope='row'><label for='url'>" + this.urlText + "</label></th>";
                         h += "<td><input type='text' id='url' class='readonly' value='" + this.currentImage.srcBase + this.currentImage.src + "' readonly='readonly' /></td>";
                         h += "</tr><tr>";
-                        h += "<th scope='row'><label for='post_title'><?php echo attribute_escape(__('Title')); ?></label></th>";
+                        h += "<th scope='row'><label for='post_title'>" + this.title + "</label></th>";
                         h += "<td><input type='text' id='post_title' name='post_title' value='" + this.currentImage.title + "' /></td>";
                         h += "</tr><tr>";
-                        h += "<th scope='row'><label for='post_content'><?php echo attribute_escape(__('Description')); ?></label></th>";
+                        h += "<th scope='row'><label for='post_content'>" + this.desc + "</label></th>";
                         h += "<td><textarea name='post_content' id='post_content'>" + this.currentImage.description + "</textarea></td>";
-                        h += "</tr><tr id='buttons' class='submit'><td colspan='2'><input type='button' id='delete' name='delete' class='delete alignleft' value='<?php echo attribute_escape(__('Delete File')); ?>' onclick='theFileList.deleteFile(" + id + ");' />";
+                        h += "</tr><tr id='buttons' class='submit'><td colspan='2'><input type='button' id='delete' name='delete' class='delete alignleft' value='" + this.deleteText + "' onclick='theFileList.deleteFile(" + id + ");' />";
                         h += "<input type='hidden' name='from_tab' value='" + this.tab + "' />";
                         h += "<input type='hidden' name='action' id='action-value' value='save' />";
                         h += "<input type='hidden' name='ID' value='" + id + "' />";
                         h += "<input type='hidden' name='_wpnonce' value='" + this.nonce + "' />";
-                        h += "<div class='submit'><input type='submit' value='<?php echo attribute_escape(__('Save &raquo;')); ?>' /></div>";
+                        h += "<div class='submit'><input type='submit' value='" + this.saveText + "' /></div>";
                         h += "</td></tr></table></form>";
 
@@ -258 +259 @@
 
                 deleteFile: function(id) {
-                        if ( confirm("<?php printf(js_escape(__("Are you sure you want to delete the file '%s'?\nClick ok to delete or cancel to go back.")), '" + this.currentImage.title + "'); ?>") ) {
+                        if ( confirm( this.confirmText.replace(/%title%/g, this.currentImage.title) ) ) {
                                 $('action-value').value = 'delete';
                                 $('upload-file').submit();
@@ -267 +268 @@
 
         };
+        Object.extend( theFileList, uploadL10n );
         theFileList.initializeVars();
         theFileList.initializeLinks();

trunk/wp-includes/js/autosave.js

@@ -1 @@
-<?php @require_once('../../wp-config.php');
-cache_javascript_headers();
-?>
 var autosaveLast = '';
 var autosavePeriodical;
@@ -9 +6 @@
         autosaveLast = form.post_title.value+form.content.value;
         // Keep autosave_interval in sync with edit_post().
-        autosavePeriodical = new PeriodicalExecuter(autosave, <?php echo apply_filters('autosave_interval', '120'); ?>);
+        autosavePeriodical = new PeriodicalExecuter(autosave, autosaveL10n.autosaveInterval);
         //Disable autosave after the form has been submitted
         if(form.addEventListener) {
@@ -41 +38 @@
 
         if(isNaN(res)) {
-                message = "<?php echo js_escape(__('Error: ')); ?>" + response;
+                message = autosaveL10n.errorText.replace(/%response%/g, response);
         } else {
-                message = "<?php echo js_escape(__('Saved at ')); ?>" + autosave_cur_time();
+                message = autosaveL10n.saveText.replace(/%time%/g, autosave_cur_time());
                 $('post_ID').name = "post_ID";
                 $('post_ID').value = res;
@@ -53 +50 @@
                 nonceAjax.setVar("cookie", document.cookie);
                 nonceAjax.setVar("post_type", $('post_type').value);
-                nonceAjax.requestFile = "<?php echo get_option('siteurl'); ?>/wp-admin/admin-ajax.php";
+                nonceAjax.requestFile = autosaveL10n.requestFile;
                 nonceAjax.onCompletion = autosave_update_nonce;
                 nonceAjax.method = "POST";
@@ -64 +61 @@
 
 function autosave_loading() {
-        $('autosave').innerHTML = "<?php echo js_escape(__('Saving Draft...')); ?>";
+        $('autosave').innerHTML = autosaveL10n.savingText;
 }
 
@@ -73 +70 @@
 
         if(isNaN(res)) {
-                message = "<?php echo js_escape(__('Error: ')); ?>" + response;
+                message = autosaveL10n.errorText.replace(/%response%/g, response);
         } else {
-                message = "<?php echo js_escape(__('Saved at ')); ?>" + autosave_cur_time() + ".";
+                message = autosaveL10n.saveText.replace(/%time%/g, autosave_cur_time());
         }
         $('autosave').innerHTML = message;
@@ -149 +146 @@
         }
 
-        autosaveAjax.requestFile = "<?php echo get_option('siteurl'); ?>/wp-admin/admin-ajax.php";
+        autosaveAjax.requestFile = autosaveL10n.requestFile;
         autosaveAjax.method = "POST";
         autosaveAjax.element = null;

trunk/wp-includes/js/list-manipulation.js

@@ -9 +9 @@
                 obj=theList;
         if ( !message )
-                message = obj.delText.replace(/%/g, what);
+                message = obj.delText.replace(/%thing%/g, what);
         if( confirm(message) )
                 return obj.ajaxDelete( what, id );
@@ -37 +37 @@
         formStore: null,
 
-        jumpText: 'Jump to new item',
-        delText: 'Are you sure you want to delete this %s?',
+        jumpText: '', // We get these from listManL10n
+        delText: '',
 
         initialize: function(theListId) {

trunk/wp-includes/js/wp-ajax.js

@@ -1 @@
-<?php @require_once('../../wp-config.php'); cache_javascript_headers(); ?>
 var WPAjax = Class.create();
 Object.extend(WPAjax.prototype, Ajax.Request.prototype);
@@ -5 +4 @@
         WPComplete: false, // onComplete function
         WPError: false, // onWPError function
+        defaultUrl: '', // We get these from WPAjaxL10n
+        permText: '',
+        strangeText: '',
+        whoaText: '',
+
         initialize: function(url, responseEl) {
                 var tempObj = this;
@@ -20 +24 @@
                         }
                 });
-                this.url = url ? url : '<?php bloginfo( 'wpurl' ); ?>/wp-admin/admin-ajax.php';
+                this.url = url ? url : this.defaultUrl;
                 this.getResponseElement(responseEl);
         },
@@ -53 +57 @@
                 var r = parseInt(r,10);
                 if ( -1 == r ) {
-                        Element.update(this.myResponseElement,"<div class='error'><p><?php _e("You don't have permission to do that."); ?></p></div>");
+                        Element.update(this.myResponseElement,"<div class='error'><p>" + this.permText + "</p></div>");
                         return false;
                 } else if ( 0 == r ) {
-                        Element.update(this.myResponseElement,"<div class='error'><p><?php _e("Something strange happened.  Try refreshing the page."); ?></p></div>");
+                        Element.update(this.myResponseElement,"<div class='error'><p>" + this.strangeText + "</p></div>");
                         return false;
                 }
@@ -72 +76 @@
 });
 
+Event.observe( window, 'load', function() { Object.extend(WPAjax.prototype, WPAjaxL10n); }, false )
+
 Ajax.activeSendCount = 0;
 Ajax.Responders.register( {
@@ -80 +86 @@
                 wpBeforeUnload = window.onbeforeunload;
                 window.onbeforeunload = function() {
-                        return "<?php js_escape(__("Slow down, I'm still sending your data!")); ?>";
+                        return WPAjax.whoaText;
                 }
         },

trunk/wp-includes/script-loader.php

@@ -20 +20 @@
                 $this->add( 'wp_tiny_mce', $mce_config, array('tiny_mce'), '20070225' );
                 $this->add( 'prototype', '/wp-includes/js/prototype.js', false, '1.5.0-0');
-                $this->add( 'autosave', '/wp-includes/js/autosave-js.php', array('prototype', 'sack'), '20070116');
-                $this->add( 'wp-ajax', '/wp-includes/js/wp-ajax-js.php', array('prototype'), '20070118');
-                $this->add( 'listman', '/wp-includes/js/list-manipulation.js', array('wp-ajax', 'fat'), '20070305');
+                $this->add( 'autosave', '/wp-includes/js/autosave.js', array('prototype', 'sack'), '20070306');
+                $this->localize( 'autosave', 'autosaveL10n', array(
+                        'autosaveInterval' => apply_filters('autosave_interval', '120'),
+                        'errorText' => __('Error: %response%'),
+                        'saveText' => __('Saved at %time%.'),
+                        'requestFile' => get_option( 'siteurl' ) . '/wp-admin/admin-ajax.php',
+                        'savingText' => __('Saving Draft...')
+                ) );
+                $this->add( 'wp-ajax', '/wp-includes/js/wp-ajax.js', array('prototype'), '20070306');
+                $this->localize( 'wp-ajax', 'WPAjaxL10n', array(
+                        'defaultUrl' => get_option( 'siteurl' ) . '/wp-admin/admin-ajax.php',
+                        'permText' => __("You don't have permission to do that."),
+                        'strangeText' => __("Something strange happened.  Try refreshing the page."),
+                        'whoaText' => __("Slow down, I'm still sending your data!")
+                ) );
+                $this->add( 'listman', '/wp-includes/js/list-manipulation.js', array('wp-ajax', 'fat'), '20070306');
                 $this->localize( 'listman', 'listManL10n', array(
                         'jumpText' => __('Jump to new item'),
-                        'delText' => __('Are you sure you want to delete this %s?')
+                        'delText' => __('Are you sure you want to delete this %thing%?')
                 ) );
                 $this->add( 'scriptaculous-root', '/wp-includes/js/scriptaculous/wp-scriptaculous.js', array('prototype'), '1.7.0');
@@ -38 +51 @@
                 $this->add( 'interface', '/wp-includes/js/jquery/interface.js', array('jquery'), '1.1.1');
                 if ( is_admin() ) {
-                        $this->add( 'dbx-admin-key', '/wp-admin/dbx-admin-key-js.php', array('dbx'), '3651' );
-                        $this->add( 'ajaxcat', '/wp-admin/cat-js.php', array('listman'), '20070118' );
+                        global $pagenow;
+                        $man = false;
+                        switch ( $pagenow ) :
+                        case 'post.php' :
+                        case 'post-new.php' :
+                                $man = 'postmeta';
+                                break;
+                        case 'page.php' :
+                        case 'page-new.php' :
+                                $man = 'pagemeta';
+                                break;
+                        case 'link.php' :
+                                $man = 'linkmeta';
+                                break;
+                        endswitch;
+                        if ( $man ) {
+                                $this->add( 'dbx-admin-key', '/wp-admin/dbx-admin-key.js', array('dbx'), '20070306' );
+                                $this->localize( 'dbx-admin-key', 'dbxL10n', array(
+                                        'manager' => $man,
+                                        'open' => __('open'),
+                                        'close' => __('close'),
+                                        'moveMouse' => __('click-down and drag to move this box'),
+                                        'toggleMouse' => __('click to %toggle% this box'),
+                                        'moveKey' => __('use the arrow keys to move this box'),
+                                        'toggleKey' => __(', or press the enter key to %toggle% it'),
+                                ) );
+                        }
+                        $this->add( 'ajaxcat', '/wp-admin/cat.js', array('listman'), '20070306' );
+                        $this->localize( 'ajaxcat', 'catL10n', array(
+                                'add' => attribute_escape(__('Add')),
+                                'how' => __('Separate multiple categories with commas.')
+                        ) );
                         $this->add( 'admin-categories', '/wp-admin/categories.js', array('listman'), '3684' );
                         $this->add( 'admin-custom-fields', '/wp-admin/custom-fields.js', array('listman'), '3733' );
@@ -45 +88 @@
                         $this->add( 'admin-users', '/wp-admin/users.js', array('listman'), '4583' );
                         $this->add( 'xfn', '/wp-admin/xfn.js', false, '3517' );
-                        $this->add( 'upload', '/wp-admin/upload-js.php', array('prototype'), '20070118' );
+                        $this->add( 'upload', '/wp-admin/upload.js', array('prototype'), '20070306' );
+                        $this->localize( 'upload', 'uploadL10n', array(
+                                'browseTitle' => attribute_escape(__('Browse your files')),
+                                'back' => __('« Back'),
+                                'directTitle' => attribute_escape(__('Direct link to file')),
+                                'edit' => __('Edit'),
+                                'thumb' => __('Thumbnail'),
+                                'full' => __('Full size'),
+                                'icon' => __('Icon'),
+                                'title' => __('Title'),
+                                'show' => __('Show:'),
+                                'link' => __('Link to:'),
+                                'file' => __('File'),
+                                'page' => __('Page'),
+                                'none' => __('None'),
+                                'editorText' => attribute_escape(__('Send to editor »')),
+                                'insert' => __('Insert'),
+                                'urlText' => __('URL'),
+                                'desc' => __('Description'),
+                                'deleteText' => attribute_escape(__('Delete File')),
+                                'saveText' => attribute_escape(__('Save »')),
+                                'confirmText' => __("Are you sure you want to delete the file '%title%'?\nClick ok to delete or cancel to go back.")
+                        ) );
                 }
         }