Ticket #439: widgets.3.2.diff

Index: Sewar/WordPress/Plugins/widgets/widgets.php
===================================================================
+++ Sewar/WordPress/Plugins/widgets/widgets.php (working copy)
@@ -1,7 +1,7 @@
 <?php
 /*
 Plugin Name: Sidebar Widgets
-Plugin URI: http://svn.wp-plugins.org/widgets/trunk
+Plugin URI: http://automattic.com/code/widgets/
 Description: Adds "Sidebar Widgets" panel under Presentation menu
 Author: Automattic, Inc.
 Author URI: http://automattic.com/
@@ -460,13 +460,13 @@
                function dragChange(o) {
                        el = o.element ? o.element : $(o);
                        var p = Position.page(el);
-                       var right = p[0];
+                       var left = p[0];
                        var top = p[1];
-                       var left = $('shadow').offsetWidth - (el.offsetWidth + left);
+                       var right = $('shadow').offsetWidth - (el.offsetWidth + left);
                        var bottom = $('shadow').offsetHeight - (el.offsetHeight + top);
-                       if ( right < 1 ) el.style.left = 0;
+                       if ( left < 1 ) el.style.left = 0;
                        if ( top < 1 ) el.style.top = 0;
-                       if ( left < 1 ) el.style.left = (left + right) + 'px';
+                       if ( right < 1 ) el.style.left = (left + right) + 'px';
                        if ( bottom < 1 ) el.style.top = (top + bottom) + 'px';
                }
                function popControl(elm) {
@@ -476,7 +476,7 @@
                        var x = ( document.body.clientWidth - controldims[elm]['width'] ) / 2;
                        var y = ( document.body.parentNode.clientHeight - controldims[elm]['height'] ) / 2;
                        el.style.position = 'absolute';
-                       el.style.right = '' + x + 'px';
+                       el.style.left = '' + x + 'px';
                        el.style.top = '' + y + 'px';
                        el.style.zIndex = 1000;
                        el.className='control';
@@ -540,8 +540,8 @@
        if ( count($registered_sidebars) < 1 ) {
 ?>
        <div class="wrap">
-       <h2><?php _e('About Dynamic Sidebars'); ?></h2>
-       <p><?php _e("You can modify your theme's sidebar, rearranging and configuring widgets right in this screen! Well, you could if you had a compatible theme. You're seeing this message because your theme isn't ready for widgets. <a href='http://andy.wordpress.com/widgets/get-ready'>Get it ready!</a>"); ?></p>
+       <h2><?php _e('About Dynamic Sidebars', 'widgets'); ?></h2>
+       <p><?php _e("You can modify your theme's sidebar, rearranging and configuring widgets right in this screen! Well, you could if you had a compatible theme. You're seeing this message because your theme isn't ready for widgets. <a href='http://andy.wordpress.com/widgets/get-ready'>Get it ready!</a>", 'widgets'); ?></p>
        </div>
 <?php
                return;
@@ -600,26 +600,26 @@
        ?>
        <?php if ( $_POST['action'] ) { ?>
        <div class="fade updated" id="message">
-       <p><?php printf(__('Sidebar Updated. <a href="%s">View site &raquo;</a>'), get_settings('home') . '/'); ?></p>
+       <p><?php printf(__('Sidebar Updated. <a href="%s">View site &raquo;</a>', 'widgets'), get_settings('home') . '/'); ?></p>
        </div>
        <?php } ?>
        <div class="wrap">
-       <h2><?php _e('Sidebar Arrangement'); ?></h2>
-       <p><?php _e("You can drag and drop widgets into your sidebar below."); ?></p>
+       <h2><?php _e('Sidebar Arrangement', 'widgets'); ?></h2>
+       <p><?php _e("You can drag and drop widgets into your sidebar below.", 'widgets'); ?></p>
        <form id="sbadmin" method="POST" onsubmit="serializeAll()">
        <div id="zones">
 <?php $i = 1; foreach ( $registered_sidebars as $index => $sidebar ) : ?>
        <input type="hidden" id="<?php echo $index; ?>order" name="<?php echo $index; ?>order" value="" />
        <div class="dropzone">
                <h3><?php echo $sidebar['name']; ?></h3>
-               <div id="<?php echo $index; ?>placematt" class="module placematt"><span class="handle"><h4><?php _e('Default Sidebar'); ?></h4><?php _e('Your theme will display its usual sidebar when this box is empty. Dragging widgets into this box will replace the usual sidebar with your customized sidebar.'); ?></span></div>
+               <div id="<?php echo $index; ?>placematt" class="module placematt"><span class="handle"><h4><?php _e('Default Sidebar', 'widgets'); ?></h4><?php _e('Your theme will display its usual sidebar when this box is empty. Dragging widgets into this box will replace the usual sidebar with your customized sidebar.', 'widgets'); ?></span></div>
                <ul id="<?php echo $index; ?>"><?php if ( is_array($sidebars_widgets[$index]) ) foreach ( $sidebars_widgets[$index] as $name ) widget_draggable($name); ?></ul>
        </div>
 <?php endforeach; ?>
        <br class="clear" />
        </div>
        <div id="palettediv">
-               <h3><?php _e('Available Widgets'); ?></h3>
+               <h3><?php _e('Available Widgets', 'widgets'); ?></h3>
                <ul id="palette"><?php foreach ( $inactive_widgets as $name ) widget_draggable($name); ?><li id="lastmodule"><span></span></li></ul>
        </div>
 
@@ -634,7 +634,7 @@
        <p class="submit">
        <?php wp_nonce_field('widgets-save-widget-order'); ?>
        <input type="hidden" name="action" id="action" value="save_widget_order" />
-       <input type="submit" value="<?php _e('Save Changes &raquo;', 'widgets'); ?>" />
+       <input type="submit" value="<?php _e('Save Changes &raquo;'); ?>" />
        </p>
        <div id="controls">
 <?php foreach ( $registered_widget_controls as $name => $widget ) : ?>
@@ -746,7 +746,7 @@
        $title = htmlspecialchars($options['title'], ENT_QUOTES);
 ?>
                        <p><label for="archives-title"><?php _e('Title:'); ?> <input style="width: 250px;" id="archives-title" name="archives-title" type="text" value="<?php echo $title; ?>" /></label></p>
-                       <p style="text-align:right;margin-right:40px;"><label for="archives-count">Show post counts <input class="checkbox" type="checkbox" <?php echo $count; ?> id="archives-count" name="archives-count" /></label></p>
+                       <p style="text-align:right;margin-right:40px;"><label for="archives-count"><?php _e('Show post counts', 'widgets'); ?> <input class="checkbox" type="checkbox" <?php echo $count; ?> id="archives-count" name="archives-count" /></label></p>
                        <input type="hidden" id="archives-submit" name="archives-submit" value="1" />
 <?php
 }
@@ -754,7 +754,7 @@
 function widget_meta($args) {
        extract($args);
        $options = get_option('widget_meta');
-       $title = empty($options['title']) ? __('Meta') : $options['title'];
+       $title = empty($options['title']) ? __('Meta', 'widgets') : $options['title'];
 ?>
                <?php echo $before_widget; ?>
                        <?php echo $before_title . $title . $after_title; ?>
@@ -1046,7 +1046,7 @@
                        $link = wp_specialchars(strip_tags($item['link']), 1);
                        $title = wp_specialchars(strip_tags($item['title']), 1);
                        if ( empty($title) )
-                               $title = __('Untitled');
+                               $title = __('Untitled', 'widgets');
                        if ( $show_summary ) {
                                $desc = '';
                                $summary = '<div class="rssSummary">' . $item['description'] . '</div>';