diff --git a/wp-admin/edit-comments.php b/wp-admin/edit-comments.php index bf9427bc49..d8d46da430 100644 --- a/wp-admin/edit-comments.php +++ b/wp-admin/edit-comments.php @@ -109,17 +109,17 @@ if ( isset( $_GET['approved'] ) || isset( $_GET['deleted'] ) || isset( $_GET['sp 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 @@ $num_comments = ( $post_id ) ? wp_count_comments( $post_id ) : wp_count_comments //, 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 @@ foreach ( $stati as $status => $label ) { $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 ) ) . ''; } diff --git a/wp-admin/includes/dashboard.php b/wp-admin/includes/dashboard.php index 7cfd12fe50..9488d4def7 100644 --- a/wp-admin/includes/dashboard.php +++ b/wp-admin/includes/dashboard.php @@ -181,7 +181,7 @@ function wp_dashboard_right_now() { // 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 @@ function wp_dashboard_right_now() { 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 @@ function wp_dashboard_right_now() { // 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 @@ function wp_dashboard_right_now() { // 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 @@ function wp_dashboard_right_now() { // 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 @@ function wp_dashboard_right_now() { // 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 @@ function wp_dashboard_right_now() { // 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 @@ function wp_dashboard_right_now() { // 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 @@ function wp_dashboard_right_now() { 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 '

    '; diff --git a/wp-admin/widgets.php b/wp-admin/widgets.php index 95e8281488..1edc8fe2d9 100644 --- a/wp-admin/widgets.php +++ b/wp-admin/widgets.php @@ -192,9 +192,9 @@ $sidebar_widget_count = count($sidebars_widgets[$sidebar]); // This is sort of lame since "widget" won't be converted to "widgets" in the JS if ( 1 < $sidebars_count = count($wp_registered_sidebars) ) - $sidebar_info_text = __ngettext( 'You are using %1$s widget in the "%2$s" sidebar.', 'You are using %1$s widgets in the "%2$s" sidebar.', $sidebar_widget_count ); + $sidebar_info_text = _n( 'You are using %1$s widget in the "%2$s" sidebar.', 'You are using %1$s widgets in the "%2$s" sidebar.', $sidebar_widget_count ); else - $sidebar_info_text = __ngettext( 'You are using %1$s widget in the sidebar.', 'You are using %1$s widgets in the sidebar.', $sidebar_widget_count ); + $sidebar_info_text = _n( 'You are using %1$s widget in the sidebar.', 'You are using %1$s widgets in the sidebar.', $sidebar_widget_count ); $sidebar_info_text = sprintf( wp_specialchars( $sidebar_info_text ), "$sidebar_widget_count", $wp_registered_sidebars[$sidebar]['name'] );