Index: wp-includes/formatting.php =================================================================== --- wp-includes/formatting.php (revision 10584) +++ wp-includes/formatting.php (working copy) @@ -1473,19 +1473,19 @@ if ($mins <= 1) { $mins = 1; } - $since = sprintf(__ngettext('%s min', '%s mins', $mins), $mins); + $since = sprintf(_n('%s min', '%s mins', $mins), $mins); } else if (($diff <= 86400) && ($diff > 3600)) { $hours = round($diff / 3600); if ($hours <= 1) { $hours = 1; } - $since = sprintf(__ngettext('%s hour', '%s hours', $hours), $hours); + $since = sprintf(_n('%s hour', '%s hours', $hours), $hours); } elseif ($diff >= 86400) { $days = round($diff / 86400); if ($days <= 1) { $days = 1; } - $since = sprintf(__ngettext('%s day', '%s days', $days), $days); + $since = sprintf(_n('%s day', '%s days', $days), $days); } return $since; } Index: wp-includes/pluggable.php =================================================================== --- wp-includes/pluggable.php (revision 10584) +++ wp-includes/pluggable.php (working copy) @@ -1038,7 +1038,7 @@ $notify_message .= sprintf( __('Delete it: %s'), admin_url("comment.php?action=cdc&c=$comment_id") ) . "\r\n"; $notify_message .= sprintf( __('Spam it: %s'), admin_url("comment.php?action=cdc&dt=spam&c=$comment_id") ) . "\r\n"; - $notify_message .= sprintf( __ngettext('Currently %s comment is waiting for approval. Please visit the moderation panel:', + $notify_message .= sprintf( _n('Currently %s comment is waiting for approval. Please visit the moderation panel:', 'Currently %s comments are waiting for approval. Please visit the moderation panel:', $comments_waiting), number_format_i18n($comments_waiting) ) . "\r\n"; $notify_message .= admin_url("edit-comments.php?comment_status=moderated") . "\r\n"; Index: wp-includes/category-template.php =================================================================== --- wp-includes/category-template.php (revision 10584) +++ wp-includes/category-template.php (working copy) @@ -598,7 +598,7 @@ * @return string text for the tooltip of a tag link. */ function default_topic_count_text( $count ) { - return sprintf( __ngettext('%s topic', '%s topics', $count), number_format_i18n( $count ) ); + return sprintf( _n('%s topic', '%s topics', $count), number_format_i18n( $count ) ); } /** @@ -638,7 +638,7 @@ if ( !isset( $args['topic_count_text_callback'] ) && isset( $args['single_text'] ) && isset( $args['multiple_text'] ) ) { $body = 'return sprintf ( - __ngettext('.var_export($args['single_text'], true).', '.var_export($args['multiple_text'], true).', $count), + _n('.var_export($args['single_text'], true).', '.var_export($args['multiple_text'], true).', $count), number_format_i18n( $count ));'; $args['topic_count_text_callback'] = create_function('$count', $body); } Index: wp-admin/users.php =================================================================== --- wp-admin/users.php (revision 10584) +++ wp-admin/users.php (working copy) @@ -202,7 +202,7 @@ case 'del': case 'del_many': $delete_count = isset($_GET['delete_count']) ? (int) $_GET['delete_count'] : 0; - $messages[] = '

' . sprintf(__ngettext('%s user deleted', '%s users deleted', $delete_count), $delete_count) . '

'; + $messages[] = '

' . sprintf(_n('%s user deleted', '%s users deleted', $delete_count), $delete_count) . '

'; break; case 'add': $messages[] = '

' . __('New user created.') . '

'; @@ -264,7 +264,7 @@ $current_role = false; $class = empty($role) ? ' class="current"' : ''; -$role_links[] = "
  • " . sprintf( __ngettext( 'All (%s)', 'All (%s)', $total_users ), number_format_i18n( $total_users ) ) . ''; +$role_links[] = "
  • " . sprintf( _n( 'All (%s)', 'All (%s)', $total_users ), number_format_i18n( $total_users ) ) . ''; foreach ( $wp_roles->get_names() as $this_role => $name ) { if ( !isset($avail_roles[$this_role]) ) continue; Index: wp-admin/edit-comments.php =================================================================== --- wp-admin/edit-comments.php (revision 10584) +++ wp-admin/edit-comments.php (working copy) @@ -109,17 +109,17 @@ echo '

    '; if ( $approved > 0 ) { - printf( __ngettext( '%s comment approved', '%s comments approved', $approved ), $approved ); + printf( _n( '%s comment approved', '%s comments approved', $approved ), $approved ); echo '
    '; } if ( $deleted > 0 ) { - printf( __ngettext( '%s comment deleted', '%s comments deleted', $deleted ), $deleted ); + printf( _n( '%s comment deleted', '%s comments deleted', $deleted ), $deleted ); echo '
    '; } if ( $spam > 0 ) { - printf( __ngettext( '%s comment marked as spam', '%s comments marked as spam', $spam ), $spam ); + printf( _n( '%s comment marked as spam', '%s comments marked as spam', $spam ), $spam ); echo '
    '; } @@ -136,10 +136,10 @@ //, number_format_i18n($num_comments->moderated) ), "" . number_format_i18n($num_comments->moderated) . ""), //, number_format_i18n($num_comments->spam) ), "" . number_format_i18n($num_comments->spam) . "") $stati = array( - 'all' => __ngettext_noop('All', 'All'), // singular not used - 'moderated' => __ngettext_noop('Pending (%s)', 'Pending (%s)'), - 'approved' => __ngettext_noop('Approved', 'Approved'), // singular not used - 'spam' => __ngettext_noop('Spam (%s)', 'Spam (%s)') + 'all' => _n_noop('All', 'All'), // singular not used + 'moderated' => _n_noop('Pending (%s)', 'Pending (%s)'), + 'approved' => _n_noop('Approved', 'Approved'), // singular not used + 'spam' => _n_noop('Spam (%s)', 'Spam (%s)') ); $class = ( '' === $comment_status ) ? ' class="current"' : ''; // $status_links[] = "

  • " . __( 'All' ) . ''; @@ -163,7 +163,7 @@ $link = add_query_arg( 's', attribute_escape( stripslashes( $_GET['s'] ) ), $link ); */ $status_links[] = "
  • " . sprintf( - __ngettext( $label[0], $label[1], $num_comments->$status ), + _n( $label[0], $label[1], $num_comments->$status ), number_format_i18n( $num_comments->$status ) ) . ''; } Index: wp-admin/includes/plugin-install.php =================================================================== --- wp-admin/includes/plugin-install.php (revision 10584) +++ wp-admin/includes/plugin-install.php (working copy) @@ -338,7 +338,7 @@ -
    +
    <?php _e('5 stars') ?>
    <?php _e('4 stars') ?>
    @@ -485,7 +485,7 @@ tested) ) : ?>
  • tested ?>
    • downloaded) ) : ?> -
  • downloaded), number_format_i18n($api->downloaded)) ?>
    • +
  • downloaded), number_format_i18n($api->downloaded)) ?>
    • slug) ) : ?>
    • homepage) ) : ?> @@ -493,7 +493,7 @@

    -
    +
    <?php _e('5 stars') ?>
    <?php _e('4 stars') ?>
    @@ -501,7 +501,7 @@
    <?php _e('2 stars') ?>
    <?php _e('1 star') ?>
    - num_ratings), number_format_i18n($api->num_ratings)); ?> + num_ratings), number_format_i18n($api->num_ratings)); ?>
    array(__('Published'), __('Published posts'), __ngettext_noop('Published (%s)', 'Published (%s)')), - 'future' => array(__('Scheduled'), __('Scheduled posts'), __ngettext_noop('Scheduled (%s)', 'Scheduled (%s)')), - 'pending' => array(__('Pending Review'), __('Pending posts'), __ngettext_noop('Pending Review (%s)', 'Pending Review (%s)')), - 'draft' => array(__('Draft'), _c('Drafts|manage posts header'), __ngettext_noop('Draft (%s)', 'Drafts (%s)')), - 'private' => array(__('Private'), __('Private posts'), __ngettext_noop('Private (%s)', 'Private (%s)')), + 'publish' => array(__('Published'), __('Published posts'), _n_noop('Published (%s)', 'Published (%s)')), + 'future' => array(__('Scheduled'), __('Scheduled posts'), _n_noop('Scheduled (%s)', 'Scheduled (%s)')), + 'pending' => array(__('Pending Review'), __('Pending posts'), _n_noop('Pending Review (%s)', 'Pending Review (%s)')), + 'draft' => array(__('Draft'), _c('Drafts|manage posts header'), _n_noop('Draft (%s)', 'Drafts (%s)')), + 'private' => array(__('Private'), __('Private posts'), _n_noop('Private (%s)', 'Private (%s)')), ); $post_stati = apply_filters('post_stati', $post_stati); @@ -840,9 +840,9 @@ $q['post_status'] = 'any'; $q['posts_per_page'] = 15; $post_mime_types = array( // array( adj, noun ) - 'image' => array(__('Images'), __('Manage Images'), __ngettext_noop('Image (%s)', 'Images (%s)')), - 'audio' => array(__('Audio'), __('Manage Audio'), __ngettext_noop('Audio (%s)', 'Audio (%s)')), - 'video' => array(__('Video'), __('Manage Video'), __ngettext_noop('Video (%s)', 'Video (%s)')), + 'image' => array(__('Images'), __('Manage Images'), _n_noop('Image (%s)', 'Images (%s)')), + 'audio' => array(__('Audio'), __('Manage Audio'), _n_noop('Audio (%s)', 'Audio (%s)')), + 'video' => array(__('Video'), __('Manage Video'), _n_noop('Video (%s)', 'Video (%s)')), ); $post_mime_types = apply_filters('post_mime_types', $post_mime_types); Index: wp-admin/includes/dashboard.php =================================================================== --- wp-admin/includes/dashboard.php (revision 10584) +++ wp-admin/includes/dashboard.php (working copy) @@ -181,7 +181,7 @@ // Posts $num = number_format_i18n( $num_posts->publish ); - $text = __ngettext( 'Post', 'Posts', intval($num_posts->publish) ); + $text = _n( 'Post', 'Posts', intval($num_posts->publish) ); if ( current_user_can( 'edit_posts' ) ) { $num = "$num"; $text = "$text"; @@ -190,16 +190,16 @@ echo '' . $text . ''; /* TODO: Show status breakdown on hover if ( $can_edit_pages && !empty($num_pages->publish) ) { // how many pages is not exposed in feeds. Don't show if !current_user_can - $post_type_texts[] = ''.sprintf( __ngettext( '%s page', '%s pages', $num_pages->publish ), number_format_i18n( $num_pages->publish ) ).''; + $post_type_texts[] = ''.sprintf( _n( '%s page', '%s pages', $num_pages->publish ), number_format_i18n( $num_pages->publish ) ).''; } if ( $can_edit_posts && !empty($num_posts->draft) ) { - $post_type_texts[] = ''.sprintf( __ngettext( '%s draft', '%s drafts', $num_posts->draft ), number_format_i18n( $num_posts->draft ) ).''; + $post_type_texts[] = ''.sprintf( _n( '%s draft', '%s drafts', $num_posts->draft ), number_format_i18n( $num_posts->draft ) ).''; } if ( $can_edit_posts && !empty($num_posts->future) ) { - $post_type_texts[] = ''.sprintf( __ngettext( '%s scheduled post', '%s scheduled posts', $num_posts->future ), number_format_i18n( $num_posts->future ) ).''; + $post_type_texts[] = ''.sprintf( _n( '%s scheduled post', '%s scheduled posts', $num_posts->future ), number_format_i18n( $num_posts->future ) ).''; } if ( current_user_can('publish_posts') && !empty($num_posts->pending) ) { - $pending_text = sprintf( __ngettext( 'There is %2$s post pending your review.', 'There are %2$s posts pending your review.', $num_posts->pending ), 'edit.php?post_status=pending', number_format_i18n( $num_posts->pending ) ); + $pending_text = sprintf( _n( 'There is %2$s post pending your review.', 'There are %2$s posts pending your review.', $num_posts->pending ), 'edit.php?post_status=pending', number_format_i18n( $num_posts->pending ) ); } else { $pending_text = ''; } @@ -207,7 +207,7 @@ // Total Comments $num = number_format_i18n($num_comm->total_comments); - $text = __ngettext( 'Comment', 'Comments', $num_comm->total_comments ); + $text = _n( 'Comment', 'Comments', $num_comm->total_comments ); if ( current_user_can( 'moderate_comments' ) ) { $num = "$num"; $text = "$text"; @@ -219,7 +219,7 @@ // Pages $num = number_format_i18n( $num_pages->publish ); - $text = __ngettext( 'Page', 'Pages', $num_pages->publish ); + $text = _n( 'Page', 'Pages', $num_pages->publish ); if ( current_user_can( 'edit_pages' ) ) { $num = "$num"; $text = "$text"; @@ -241,7 +241,7 @@ // Categories $num = number_format_i18n( $num_cats ); - $text = __ngettext( 'Category', 'Categories', $num_cats ); + $text = _n( 'Category', 'Categories', $num_cats ); if ( current_user_can( 'manage_categories' ) ) { $num = "$num"; $text = "$text"; @@ -251,7 +251,7 @@ // Pending Comments $num = number_format_i18n($num_comm->moderated); - $text = __ngettext( 'Pending', 'Pending', $num_comm->moderated ); + $text = _n( 'Pending', 'Pending', $num_comm->moderated ); if ( current_user_can( 'moderate_comments' ) ) { $num = "$num"; $text = "$text"; @@ -263,7 +263,7 @@ // Tags $num = number_format_i18n( $num_tags ); - $text = __ngettext( 'Tag', 'Tags', $num_tags ); + $text = _n( 'Tag', 'Tags', $num_tags ); if ( current_user_can( 'manage_categories' ) ) { $num = "$num"; $text = "$text"; @@ -273,7 +273,7 @@ // Spam Comments $num = number_format_i18n($num_comm->spam); - $text = __ngettext( 'Spam', 'Spam', $num_comm->spam ); + $text = _n( 'Spam', 'Spam', $num_comm->spam ); if ( current_user_can( 'moderate_comments' ) ) { $num = "$num"; $text = "$text"; @@ -294,9 +294,9 @@ echo "\n\t

    "; if ( current_user_can( 'switch_themes' ) ) { echo '' . __('Change Theme') . ''; - printf(__ngettext('Theme %1$s with %2$s Widget', 'Theme %1$s with %2$s Widgets', $num_widgets), $ct->title, $num); + printf(_n('Theme %1$s with %2$s Widget', 'Theme %1$s with %2$s Widgets', $num_widgets), $ct->title, $num); } else { - printf(__ngettext('Theme %1$s with %2$s Widget', 'Theme %1$s with %2$s Widgets', $num_widgets), $ct->title, $num); + printf(_n('Theme %1$s with %2$s Widget', 'Theme %1$s with %2$s Widgets', $num_widgets), $ct->title, $num); } echo '

    '; Index: wp-admin/includes/theme-install.php =================================================================== --- wp-admin/includes/theme-install.php (revision 10584) +++ wp-admin/includes/theme-install.php (working copy) @@ -469,7 +469,7 @@ tested) ) : ?>
  • tested ?>
    • downloaded) ) : ?> -
  • downloaded), number_format_i18n($api->downloaded)) ?>
    • +
  • downloaded), number_format_i18n($api->downloaded)) ?>
    • slug) ) : ?>
    • homepage) ) : ?> @@ -477,7 +477,7 @@

    -
    +
    <?php _e('5 stars') ?>
    <?php _e('4 stars') ?>
    @@ -485,7 +485,7 @@
    <?php _e('2 stars') ?>
    <?php _e('1 star') ?>
    - num_ratings), number_format_i18n($api->num_ratings)); ?> + num_ratings), number_format_i18n($api->num_ratings)); ?>
    $mime_type, 'paged'=>false))) . "'$class>" . sprintf(__ngettext($label[2][0], $label[2][1], $num_posts[$mime_type]), "" . number_format_i18n( $num_posts[$mime_type] ) . '') . ''; + $type_links[] = "
  • $mime_type, 'paged'=>false))) . "'$class>" . sprintf(_n($label[2][0], $label[2][1], $num_posts[$mime_type]), "" . number_format_i18n( $num_posts[$mime_type] ) . '') . ''; } echo implode(' |
    • ', $type_links) . ''; unset($type_links); Index: wp-admin/import/btt.php =================================================================== --- wp-admin/import/btt.php (revision 10584) +++ wp-admin/import/btt.php (working copy) @@ -83,7 +83,7 @@ return false; } else { $count = count($metakeys); - echo '

    ' . sprintf( __ngettext('Done! %s post with tags were read.', 'Done! %s posts with tags were read.', $count), $count ) . '

    '; + echo '

    ' . sprintf( _n('Done! %s post with tags were read.', 'Done! %s posts with tags were read.', $count), $count ) . '

    '; echo '