Changeset 9589

Timestamp:

11/10/2008 05:42:51 PM (15 years ago)

Author:

ryan

Message:

i18n fixes from nbachiyski. fixes #8142

Location:

trunk/wp-admin

Files:

• categories.php (modified) (1 diff)
• edit-comments.php (modified) (2 diffs)
• edit-link-categories.php (modified) (1 diff)
• edit-pages.php (modified) (2 diffs)
• edit-tags.php (modified) (1 diff)
• edit.php (modified) (2 diffs)
• includes/user.php (modified) (1 diff)
• options-general.php (modified) (2 diffs)
• press-this.php (modified) (1 diff)
• themes.php (modified) (1 diff)
• upload.php (modified) (1 diff)

trunk/wp-admin/categories.php

@@ -296 +296 @@
         $('#doaction, #doaction2').click(function(){
             if ( $('select[name^="action"]').val() == 'delete' ) {
-                var n = $('#the-list input[type="checkbox"]:checked').length;
-                var m = n > 1 ? '<?php echo js_escape(__("You are about to delete the selected categories.\n  'Cancel' to stop, 'OK' to delete.")); ?>' : '<?php echo js_escape(__("You are about to delete the selected category.\n  'Cancel' to stop, 'OK' to delete.")); ?>';
+                var m = '<?php echo js_escape(__("You are about to delete the selected categories.\n  'Cancel' to stop, 'OK' to delete.")); ?>';
                 return showNotice.warn(m);
             }

trunk/wp-admin/edit-comments.php

@@ -191 +191 @@
 
 <?php if ( $page_links ) : ?>
-<div class="tablenav-pages"><?php $page_links_text = sprintf( '<span class="displaying-num">' . __( 'Displaying %s&#8211;%s of %s' ) . '</span>' . __( '%s' ),
+<div class="tablenav-pages"><?php $page_links_text = sprintf( '<span class="displaying-num">' . __( 'Displaying %s&#8211;%s of %s' ) . '</span>%s',
     number_format_i18n( $start + 1 ),
     number_format_i18n( min( $page * $comments_per_page, $total ) ),
@@ -345 +345 @@
         $('#doaction, #doaction2').click(function(){
             if ( $('select[name^="action"]').val() == 'delete' ) {
-                var n = $('#the-comment-list input[type="checkbox"]:checked').length;
-                var m = n > 1 ? '<?php echo js_escape(__("You are about to delete the selected comments.\n  'Cancel' to stop, 'OK' to delete.")); ?>' : '<?php echo js_escape(__("You are about to delete the selected comment.\n  'Cancel' to stop, 'OK' to delete.")); ?>';
+                var m = '<?php echo js_escape(__("You are about to delete the selected comments.\n  'Cancel' to stop, 'OK' to delete.")); ?>';
                 return showNotice.warn(m);
             }

trunk/wp-admin/edit-link-categories.php

@@ -230 +230 @@
         $('#doaction, #doaction2').click(function(){
             if ( $('select[name^="action"]').val() == 'delete' ) {
-                var n = $('#the-list input[type="checkbox"]:checked').length;
-                var m = n > 1 ? '<?php echo js_escape(__("You are about to delete the selected link categories.\n  'Cancel' to stop, 'OK' to delete.")); ?>' : '<?php echo js_escape(__("You are about to delete the selected link category.\n  'Cancel' to stop, 'OK' to delete.")); ?>';
+                var m = '<?php echo js_escape(__("You are about to delete the selected link categories.\n  'Cancel' to stop, 'OK' to delete.")); ?>';
                 return showNotice.warn(m);
             }

trunk/wp-admin/edit-pages.php

@@ -188 +188 @@
 
 if ( $page_links ) : ?>
-<div class="tablenav-pages"><?php $page_links_text = sprintf( '<span class="displaying-num">' . __( 'Displaying %s&#8211;%s of %s' ) . '</span>' . __( '%s' ),
+<div class="tablenav-pages"><?php $page_links_text = sprintf( '<span class="displaying-num">' . __( 'Displaying %s&#8211;%s of %s' ) . '</span>%s',
     number_format_i18n( ( $pagenum - 1 ) * $per_page + 1 ),
     number_format_i18n( min( $pagenum * $per_page, $wp_query->post_count ) ),
@@ -312 +312 @@
         $('#doaction, #doaction2').click(function(){
             if ( $('select[name^="action"]').val() == 'delete' ) {
-                var n = $('table.post input[type="checkbox"]:checked').length;
-                var m = n > 1 ? '<?php echo js_escape(__("You are about to delete the selected pages.\n  'Cancel' to stop, 'OK' to delete.")); ?>' : '<?php echo js_escape(__("You are about to delete the selected page.\n  'Cancel' to stop, 'OK' to delete.")); ?>';
+                var m = '<?php echo js_escape(__("You are about to delete the selected pages.\n  'Cancel' to stop, 'OK' to delete.")); ?>';
                 return showNotice.warn(m);
             }

trunk/wp-admin/edit-tags.php

@@ -287 +287 @@
         $('#doaction, #doaction2').click(function(){
             if ( $('select[name^="action"]').val() == 'delete' ) {
-                var n = $('#the-list input[type="checkbox"]:checked').length;
-                var m = n > 1 ? '<?php echo js_escape(__("You are about to delete the selected tags.\n  'Cancel' to stop, 'OK' to delete.")); ?>' : '<?php echo js_escape(__("You are about to delete the selected tag.\n  'Cancel' to stop, 'OK' to delete.")); ?>';
+                var m = '<?php echo js_escape(__("You are about to delete the selected tags.\n  'Cancel' to stop, 'OK' to delete.")); ?>';
                 return showNotice.warn(m);
             }

trunk/wp-admin/edit.php

@@ -226 +226 @@
 
 <?php if ( $page_links ) { ?>
-<div class="tablenav-pages"><?php $page_links_text = sprintf( '<span class="displaying-num">' . __( 'Displaying %s&#8211;%s of %s' ) . '</span>' . __( '%s' ),
+<div class="tablenav-pages"><?php $page_links_text = sprintf( '<span class="displaying-num">' . __( 'Displaying %s&#8211;%s of %s' ) . '</span>%s',
     number_format_i18n( ( $_GET['paged'] - 1 ) * $wp_query->query_vars['posts_per_page'] + 1 ),
     number_format_i18n( min( $_GET['paged'] * $wp_query->query_vars['posts_per_page'], $wp_query->found_posts ) ),
@@ -327 +327 @@
         $('#doaction, #doaction2').click(function(){
             if ( $('select[name^="action"]').val() == 'delete' ) {
-                var n = $('table.post input[type="checkbox"]:checked').length;
-                var m = n > 1 ? '<?php echo js_escape(__("You are about to delete the selected posts.\n  'Cancel' to stop, 'OK' to delete.")); ?>' : '<?php echo js_escape(__("You are about to delete the selected post.\n  'Cancel' to stop, 'OK' to delete.")); ?>';
+                var m = '<?php echo js_escape(__("You are about to delete the selected posts.\n  'Cancel' to stop, 'OK' to delete.")); ?>';
                 return showNotice.warn(m);
             }

trunk/wp-admin/includes/user.php

@@ -667 +667 @@
             ) );
             if ( $this->paging_text ) {
-                $this->paging_text = sprintf( '<span class="displaying-num">' . __( 'Displaying %s&#8211;%s of %s' ) . '</span>' . __( '%s' ),
+                $this->paging_text = sprintf( '<span class="displaying-num">' . __( 'Displaying %s&#8211;%s of %s' ) . '</span>%s',
                     number_format_i18n( ( $this->page - 1 ) * $this->users_per_page + 1 ),
                     number_format_i18n( min( $this->page * $this->users_per_page, $this->total_users_for_query ) ),

trunk/wp-admin/options-general.php

@@ -154 +154 @@
     echo '  <label><input type="radio" name="date_format" id="date_format_custom_radio" value="\c\u\s\t\o\m"';
     checked( $custom, TRUE );
-    echo '/> ' . __('Custom') . ': </label><input type="text" name="date_format_custom" value="' . attribute_escape( get_option('date_format') ) . '" class="small-text" /> ' . gmdate( get_option('date_format'), current_time('timestamp') ) . "\n";
+    echo '/> ' . __('Custom:') . ' </label><input type="text" name="date_format_custom" value="' . attribute_escape( get_option('date_format') ) . '" class="small-text" /> ' . gmdate( get_option('date_format'), current_time('timestamp') ) . "\n";
 
     echo "\t<p>" . __('<a href="http://codex.wordpress.org/Formatting_Date_and_Time">Documentation on date formatting</a>. Click "Save Changes" to update sample output.') . "</p>\n";
@@ -186 +186 @@
     echo '  <label><input type="radio" name="time_format" id="time_format_custom_radio" value="\c\u\s\t\o\m"';
     checked( $custom, TRUE );
-    echo '/> ' . __('Custom') . ': </label><input type="text" name="time_format_custom" value="' . attribute_escape( get_option('time_format') ) . '" class="small-text" /> ' . gmdate( get_option('time_format'), current_time('timestamp') ) . "\n";
+    echo '/> ' . __('Custom:') . ' </label><input type="text" name="time_format_custom" value="' . attribute_escape( get_option('time_format') ) . '" class="small-text" /> ' . gmdate( get_option('time_format'), current_time('timestamp') ) . "\n";
 ?>
     </fieldset>

trunk/wp-admin/press-this.php

@@ -523 +523 @@
                     <textarea name="content" id="content" style="width:100%;" class="mceEditor" rows="15">
                     <?php if ($selection) echo wp_richedit_pre($selection); ?>
-                    <?php if ($url) { ?><p><?php if($selection) _e('via'); ?> <a href="<?php echo $url ?>"><?php echo $title; ?></a>.</p><?php } ?>
+                    <?php if ($url) { echo '<p>'; if($selection) printf( __('via %s.'), "<a href='$url'>$title</a>" ); echo '</p>'; } ?>
                     </textarea>
                 </div>

trunk/wp-admin/themes.php

@@ -126 +126 @@
 
 <?php if ( $page_links ) : ?>
-<div class="tablenav-pages"><?php $page_links_text = sprintf( '<span class="displaying-num">' . __( 'Displaying %s&#8211;%s of %s' ) . '</span>' . __( '%s' ),
+<div class="tablenav-pages"><?php $page_links_text = sprintf( '<span class="displaying-num">' . __( 'Displaying %s&#8211;%s of %s' ) . '</span>%s',
     number_format_i18n( $start + 1 ),
     number_format_i18n( min( $page * $per_page, $theme_total ) ),

trunk/wp-admin/upload.php

@@ -237 +237 @@
 
 if ( $page_links ) : ?>
-<div class="tablenav-pages"><?php $page_links_text = sprintf( '<span class="displaying-num">' . __( 'Displaying %s&#8211;%s of %s' ) . '</span>' . __( '%s' ),
+<div class="tablenav-pages"><?php $page_links_text = sprintf( '<span class="displaying-num">' . __( 'Displaying %s&#8211;%s of %s' ) . '</span>%s',
     number_format_i18n( ( $_GET['paged'] - 1 ) * $wp_query->query_vars['posts_per_page'] + 1 ),
     number_format_i18n( min( $_GET['paged'] * $wp_query->query_vars['posts_per_page'], $wp_query->found_posts ) ),