WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use _n(). Props nbachiyski. fixes #9111 

git-svn-id: http://svn.automattic.com/wordpress/trunk@10606 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
ryan 2009-02-20 19:35:16 +00:00
parent 750459382b
commit fc660a45a3
23 changed files with 61 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
wp-admin/edit-pages.php
View File

@ -112,22 +112,22 @@ if ( isset($_GET['s']) && $_GET['s'] )
<?php if ( isset($_GET['locked']) || isset($_GET['skipped']) || isset($_GET['updated']) || isset($_GET['deleted']) ) { ?> <?php if ( isset($_GET['locked']) || isset($_GET['skipped']) || isset($_GET['updated']) || isset($_GET['deleted']) ) { ?>
<div id="message" class="updated fade"><p> <div id="message" class="updated fade"><p>
<?php if ( isset($_GET['updated']) && (int) $_GET['updated'] ) { <?php if ( isset($_GET['updated']) && (int) $_GET['updated'] ) {
printf( __ngettext( '%s page updated.', '%s pages updated.', $_GET['updated'] ), number_format_i18n( $_GET['updated'] ) ); printf( _n( '%s page updated.', '%s pages updated.', $_GET['updated'] ), number_format_i18n( $_GET['updated'] ) );
unset($_GET['updated']); unset($_GET['updated']);
} }
if ( isset($_GET['skipped']) && (int) $_GET['skipped'] ) { if ( isset($_GET['skipped']) && (int) $_GET['skipped'] ) {
printf( __ngettext( '%s page not updated, invalid parent page specified.', '%s pages not updated, invalid parent page specified.', $_GET['skipped'] ), number_format_i18n( $_GET['skipped'] ) ); printf( _n( '%s page not updated, invalid parent page specified.', '%s pages not updated, invalid parent page specified.', $_GET['skipped'] ), number_format_i18n( $_GET['skipped'] ) );
unset($_GET['skipped']); unset($_GET['skipped']);
} }
if ( isset($_GET['locked']) && (int) $_GET['locked'] ) { if ( isset($_GET['locked']) && (int) $_GET['locked'] ) {
printf( __ngettext( '%s page not updated, somebody is editing it.', '%s pages not updated, somebody is editing them.', $_GET['locked'] ), number_format_i18n( $_GET['skipped'] ) ); printf( _n( '%s page not updated, somebody is editing it.', '%s pages not updated, somebody is editing them.', $_GET['locked'] ), number_format_i18n( $_GET['skipped'] ) );
unset($_GET['locked']); unset($_GET['locked']);
} }
if ( isset($_GET['deleted']) && (int) $_GET['deleted'] ) { if ( isset($_GET['deleted']) && (int) $_GET['deleted'] ) {
printf( __ngettext( 'Page deleted.', '%s pages deleted.', $_GET['deleted'] ), number_format_i18n( $_GET['deleted'] ) ); printf( _n( 'Page deleted.', '%s pages deleted.', $_GET['deleted'] ), number_format_i18n( $_GET['deleted'] ) );
unset($_GET['deleted']); unset($_GET['deleted']);
} }
$_SERVER['REQUEST_URI'] = remove_query_arg( array('locked', 'skipped', 'updated', 'deleted'), $_SERVER['REQUEST_URI'] ); $_SERVER['REQUEST_URI'] = remove_query_arg( array('locked', 'skipped', 'updated', 'deleted'), $_SERVER['REQUEST_URI'] );
@ -150,7 +150,7 @@ $status_links = array();
$num_posts = wp_count_posts('page', 'readable'); $num_posts = wp_count_posts('page', 'readable');
$total_posts = array_sum( (array) $num_posts ); $total_posts = array_sum( (array) $num_posts );
$class = empty($_GET['post_status']) ? ' class="current"' : ''; $class = empty($_GET['post_status']) ? ' class="current"' : '';
$status_links[] = "<li><a href='edit-pages.php'$class>" . sprintf( __ngettext( 'All <span class="count">(%s)</span>', 'All <span class="count">(%s)</span>', $total_posts ), number_format_i18n( $total_posts ) ) . '</a>'; $status_links[] = "<li><a href='edit-pages.php'$class>" . sprintf( _n( 'All <span class="count">(%s)</span>', 'All <span class="count">(%s)</span>', $total_posts ), number_format_i18n( $total_posts ) ) . '</a>';
foreach ( $post_stati as $status => $label ) { foreach ( $post_stati as $status => $label ) {
$class = ''; $class = '';

10
wp-admin/edit.php
View File

@ -110,7 +110,7 @@ endif; ?>
<?php if ( isset($_GET['locked']) || isset($_GET['skipped']) || isset($_GET['updated']) || isset($_GET['deleted']) ) { ?> <?php if ( isset($_GET['locked']) || isset($_GET['skipped']) || isset($_GET['updated']) || isset($_GET['deleted']) ) { ?>
<div id="message" class="updated fade"><p> <div id="message" class="updated fade"><p>
<?php if ( isset($_GET['updated']) && (int) $_GET['updated'] ) { <?php if ( isset($_GET['updated']) && (int) $_GET['updated'] ) {
printf( __ngettext( '%s post updated.', '%s posts updated.', $_GET['updated'] ), number_format_i18n( $_GET['updated'] ) ); printf( _n( '%s post updated.', '%s posts updated.', $_GET['updated'] ), number_format_i18n( $_GET['updated'] ) );
unset($_GET['updated']); unset($_GET['updated']);
} }
@ -118,12 +118,12 @@ if ( isset($_GET['skipped']) && (int) $_GET['skipped'] )
unset($_GET['skipped']); unset($_GET['skipped']);
if ( isset($_GET['locked']) && (int) $_GET['locked'] ) { if ( isset($_GET['locked']) && (int) $_GET['locked'] ) {
printf( __ngettext( '%s post not updated, somebody is editing it.', '%s posts not updated, somebody is editing them.', $_GET['locked'] ), number_format_i18n( $_GET['locked'] ) ); printf( _n( '%s post not updated, somebody is editing it.', '%s posts not updated, somebody is editing them.', $_GET['locked'] ), number_format_i18n( $_GET['locked'] ) );
unset($_GET['locked']); unset($_GET['locked']);
} }
if ( isset($_GET['deleted']) && (int) $_GET['deleted'] ) { if ( isset($_GET['deleted']) && (int) $_GET['deleted'] ) {
printf( __ngettext( 'Post deleted.', '%s posts deleted.', $_GET['deleted'] ), number_format_i18n( $_GET['deleted'] ) ); printf( _n( 'Post deleted.', '%s posts deleted.', $_GET['deleted'] ), number_format_i18n( $_GET['deleted'] ) );
unset($_GET['deleted']); unset($_GET['deleted']);
} }
@ -141,7 +141,7 @@ $status_links = array();
$num_posts = wp_count_posts( 'post', 'readable' ); $num_posts = wp_count_posts( 'post', 'readable' );
$total_posts = array_sum( (array) $num_posts ); $total_posts = array_sum( (array) $num_posts );
$class = empty( $_GET['post_status'] ) ? ' class="current"' : ''; $class = empty( $_GET['post_status'] ) ? ' class="current"' : '';
$status_links[] = "<li><a href='edit.php' $class>" . sprintf( __ngettext( 'All <span class="count">(%s)</span>', 'All <span class="count">(%s)</span>', $total_posts ), number_format_i18n( $total_posts ) ) . '</a>'; $status_links[] = "<li><a href='edit.php' $class>" . sprintf( _n( 'All <span class="count">(%s)</span>', 'All <span class="count">(%s)</span>', $total_posts ), number_format_i18n( $total_posts ) ) . '</a>';
foreach ( $post_stati as $status => $label ) { foreach ( $post_stati as $status => $label ) {
@ -155,7 +155,7 @@ foreach ( $post_stati as $status => $label ) {
if ( isset($_GET['post_status']) && $status == $_GET['post_status'] ) if ( isset($_GET['post_status']) && $status == $_GET['post_status'] )
$class = ' class="current"'; $class = ' class="current"';
$status_links[] = "<li><a href='edit.php?post_status=$status' $class>" . sprintf( __ngettext( $label[2][0], $label[2][1], $num_posts->$status ), number_format_i18n( $num_posts->$status ) ) . '</a>'; $status_links[] = "<li><a href='edit.php?post_status=$status' $class>" . sprintf( _n( $label[2][0], $label[2][1], $num_posts->$status ), number_format_i18n( $num_posts->$status ) ) . '</a>';
} }
echo implode( " |</li>\n", $status_links ) . '</li>'; echo implode( " |</li>\n", $status_links ) . '</li>';
unset( $status_links ); unset( $status_links );

2
wp-admin/import/blogware.php
View File

@ -155,7 +155,7 @@ class BW_Import {
} }
if ( $num_comments ) { if ( $num_comments ) {
echo ' '; echo ' ';
printf( __ngettext('%s comment', '%s comments', $num_comments), $num_comments ); printf( _n('%s comment', '%s comments', $num_comments), $num_comments );
} }
echo '</li>'; echo '</li>';
flush(); flush();

2
wp-admin/import/btt.php
View File

@ -83,7 +83,7 @@ class BunnyTags_Import {
return false; return false;
} else { } else {
$count = count($metakeys); $count = count($metakeys);
echo '<p>' . sprintf( __ngettext('Done! <strong>%s</strong> post with tags were read.', 'Done! <strong>%s</strong> posts with tags were read.', $count), $count ) . '<br /></p>'; echo '<p>' . sprintf( _n('Done! <strong>%s</strong> post with tags were read.', 'Done! <strong>%s</strong> posts with tags were read.', $count), $count ) . '<br /></p>';
echo '<ul>'; echo '<ul>';
foreach ( $metakeys as $post_meta ) { foreach ( $metakeys as $post_meta ) {
if ( $post_meta->meta_value != '' ) { if ( $post_meta->meta_value != '' ) {

4
wp-admin/import/dotclear.php
View File

@ -312,7 +312,7 @@ class Dotclear_Import {
// Store category translation for future use // Store category translation for future use
add_option('dccat2wpcat',$dccat2wpcat); add_option('dccat2wpcat',$dccat2wpcat);
echo '<p>'.sprintf(__ngettext('Done! <strong>%1$s</strong> category imported.', 'Done! <strong>%1$s</strong> categories imported.', $count), $count).'<br /><br /></p>'; echo '<p>'.sprintf(_n('Done! <strong>%1$s</strong> category imported.', 'Done! <strong>%1$s</strong> categories imported.', $count), $count).'<br /><br /></p>';
return true; return true;
} }
echo __('No Categories to Import!'); echo __('No Categories to Import!');
@ -613,7 +613,7 @@ class Dotclear_Import {
} }
add_option('dclinks2wplinks',$dclinks2wplinks); add_option('dclinks2wplinks',$dclinks2wplinks);
echo '<p>'; echo '<p>';
printf(__ngettext('Done! <strong>%s</strong> link or link category imported.', 'Done! <strong>%s</strong> links or link categories imported.', $count), $count); printf(_n('Done! <strong>%s</strong> link or link category imported.', 'Done! <strong>%s</strong> links or link categories imported.', $count), $count);
echo '<br /><br /></p>'; echo '<br /><br /></p>';
return true; return true;
} }

4
wp-admin/import/greymatter.php
View File

@ -283,12 +283,12 @@ class GM_Import {
} }
if ($numAddedComments > 0) { if ($numAddedComments > 0) {
echo ': '; echo ': ';
printf( __ngettext('imported %s comment', 'imported %s comments', $numAddedComments) , $numAddedComments); printf( _n('imported %s comment', 'imported %s comments', $numAddedComments) , $numAddedComments);
} }
$preExisting = $numComments - numAddedComments; $preExisting = $numComments - numAddedComments;
if ($preExisting > 0) { if ($preExisting > 0) {
echo ' '; echo ' ';
printf( __ngettext( 'ignored %s pre-existing comment', 'ignored %s pre-existing comments', $preExisting ) , $preExisting); printf( _n( 'ignored %s pre-existing comment', 'ignored %s pre-existing comments', $preExisting ) , $preExisting);
} }
} }
echo '... <strong>'.__('Done').'</strong></li>'; echo '... <strong>'.__('Done').'</strong></li>';

4
wp-admin/import/jkw.php
View File

@ -98,7 +98,7 @@ class JeromesKeyword_Import {
return false; return false;
} else { } else {
$count = count($metakeys); $count = count($metakeys);
echo '<p>' . sprintf( __ngettext('Done! <strong>%s</strong> post with tags were read.', 'Done! <strong>%s</strong> posts with tags were read.', $count), $count ) . '<br /></p>'; echo '<p>' . sprintf( _n('Done! <strong>%s</strong> post with tags were read.', 'Done! <strong>%s</strong> posts with tags were read.', $count), $count ) . '<br /></p>';
echo '<ul>'; echo '<ul>';
foreach ( $metakeys as $post_meta ) { foreach ( $metakeys as $post_meta ) {
if ( $post_meta->meta_value != '' ) { if ( $post_meta->meta_value != '' ) {
@ -139,7 +139,7 @@ class JeromesKeyword_Import {
return false; return false;
} else { } else {
$count = count($metakeys); $count = count($metakeys);
echo '<p>' . sprintf( __ngettext('Done! <strong>%s</strong> tag were read.', 'Done! <strong>%s</strong> tags were read.', $count), $count ) . '<br /></p>'; echo '<p>' . sprintf( _n('Done! <strong>%s</strong> tag were read.', 'Done! <strong>%s</strong> tags were read.', $count), $count ) . '<br /></p>';
echo '<ul>'; echo '<ul>';
foreach ( $metakeys as $post_meta ) { foreach ( $metakeys as $post_meta ) {
$keyword = addslashes(trim($post_meta->tag_name)); $keyword = addslashes(trim($post_meta->tag_name));

4
wp-admin/import/mt.php
View File

@ -288,7 +288,7 @@ class MT_Import {
} }
if ( $num_comments ) if ( $num_comments )
printf(' '.__ngettext('(%s comment)', '(%s comments)', $num_comments), $num_comments); printf(' '._n('(%s comment)', '(%s comments)', $num_comments), $num_comments);
$num_pings = 0; $num_pings = 0;
foreach ( $pings as $ping ) { foreach ( $pings as $ping ) {
@ -305,7 +305,7 @@ class MT_Import {
} }
if ( $num_pings ) if ( $num_pings )
printf(' '.__ngettext('(%s ping)', '(%s pings)', $num_pings), $num_pings); printf(' '._n('(%s ping)', '(%s pings)', $num_pings), $num_pings);
echo "</li>"; echo "</li>";
//ob_flush();flush(); //ob_flush();flush();

4
wp-admin/import/stp.php
View File

@ -88,7 +88,7 @@ class STP_Import {
add_option('stpimp_posts', $posts); add_option('stpimp_posts', $posts);
$count = count($posts); $count = count($posts);
echo '<p>' . sprintf( __ngettext('Done! <strong>%s</strong> tag to post relationships were read.', 'Done! <strong>%s</strong> tags to post relationships were read.', $count), $count ) . '<br /></p>'; echo '<p>' . sprintf( _n('Done! <strong>%s</strong> tag to post relationships were read.', 'Done! <strong>%s</strong> tags to post relationships were read.', $count), $count ) . '<br /></p>';
} }
echo '<form action="admin.php?import=stp&amp;step=2" method="post">'; echo '<form action="admin.php?import=stp&amp;step=2" method="post">';
@ -106,7 +106,7 @@ class STP_Import {
// run that funky magic! // run that funky magic!
$tags_added = $this->tag2post(); $tags_added = $this->tag2post();
echo '<p>' . sprintf( __ngettext('Done! <strong>%s</strong> tag was added!', 'Done! <strong>%s</strong> tags were added!', $tags_added), $tags_added ) . '<br /></p>'; echo '<p>' . sprintf( _n('Done! <strong>%s</strong> tag was added!', 'Done! <strong>%s</strong> tags were added!', $tags_added), $tags_added ) . '<br /></p>';
echo '<form action="admin.php?import=stp&amp;step=3" method="post">'; echo '<form action="admin.php?import=stp&amp;step=3" method="post">';
wp_nonce_field('import-stp'); wp_nonce_field('import-stp');
echo '<p class="submit"><input type="submit" name="submit" class="button" value="'.__('Step 3').'" /></p>'; echo '<p class="submit"><input type="submit" name="submit" class="button" value="'.__('Step 3').'" /></p>';

4
wp-admin/import/textpattern.php
View File

@ -201,7 +201,7 @@ class Textpattern_Import {
// Store category translation for future use // Store category translation for future use
add_option('txpcat2wpcat',$txpcat2wpcat); add_option('txpcat2wpcat',$txpcat2wpcat);
echo '<p>'.sprintf(__ngettext('Done! <strong>%1$s</strong> category imported.', 'Done! <strong>%1$s</strong> categories imported.', $count), $count).'<br /><br /></p>'; echo '<p>'.sprintf(_n('Done! <strong>%1$s</strong> category imported.', 'Done! <strong>%1$s</strong> categories imported.', $count), $count).'<br /><br /></p>';
return true; return true;
} }
echo __('No Categories to Import!'); echo __('No Categories to Import!');
@ -486,7 +486,7 @@ class Textpattern_Import {
} }
add_option('txplinks2wplinks',$txplinks2wplinks); add_option('txplinks2wplinks',$txplinks2wplinks);
echo '<p>'; echo '<p>';
printf(__ngettext('Done! <strong>%s</strong> link imported', 'Done! <strong>%s</strong> links imported', $count), $count); printf(_n('Done! <strong>%s</strong> link imported', 'Done! <strong>%s</strong> links imported', $count), $count);
echo '<br /><br /></p>'; echo '<br /><br /></p>';
return true; return true;
} }

6
wp-admin/import/utw.php
View File

@ -98,7 +98,7 @@ class UTW_Import {
$count = count($tags); $count = count($tags);
echo '<p>' . sprintf( __ngettext('Done! <strong>%s</strong> tag were read.', 'Done! <strong>%s</strong> tags were read.', $count), $count ) . '<br /></p>'; echo '<p>' . sprintf( _n('Done! <strong>%s</strong> tag were read.', 'Done! <strong>%s</strong> tags were read.', $count), $count ) . '<br /></p>';
echo '<p>' . __('The following tags were found:') . '</p>'; echo '<p>' . __('The following tags were found:') . '</p>';
echo '<ul>'; echo '<ul>';
@ -150,7 +150,7 @@ class UTW_Import {
$count = count($posts); $count = count($posts);
echo '<p>' . sprintf( __ngettext('Done! <strong>%s</strong> tag to post relationships were read.', 'Done! <strong>%s</strong> tags to post relationships were read.', $count), $count ) . '<br /></p>'; echo '<p>' . sprintf( _n('Done! <strong>%s</strong> tag to post relationships were read.', 'Done! <strong>%s</strong> tags to post relationships were read.', $count), $count ) . '<br /></p>';
} }
@ -171,7 +171,7 @@ class UTW_Import {
// run that funky magic! // run that funky magic!
$tags_added = $this->tag2post(); $tags_added = $this->tag2post();
echo '<p>' . sprintf( __ngettext( 'Done! <strong>%s</strong> tag were added!', 'Done! <strong>%s</strong> tags were added!', $tags_added ), $tags_added ) . '<br /></p>'; echo '<p>' . sprintf( _n( 'Done! <strong>%s</strong> tag were added!', 'Done! <strong>%s</strong> tags were added!', $tags_added ), $tags_added ) . '<br /></p>';
echo '<form action="admin.php?import=utw&amp;step=4" method="post">'; echo '<form action="admin.php?import=utw&amp;step=4" method="post">';
wp_nonce_field('import-utw'); wp_nonce_field('import-utw');

2
wp-admin/import/wordpress.php
View File

@ -528,7 +528,7 @@ class WP_Import {
} } } }
if ( $num_comments ) if ( $num_comments )
printf(' '.__ngettext('(%s comment)', '(%s comments)', $num_comments), $num_comments); printf(' '._n('(%s comment)', '(%s comments)', $num_comments), $num_comments);
// Now for post meta // Now for post meta
preg_match_all('|<wp:postmeta>(.*?)</wp:postmeta>|is', $post, $postmeta); preg_match_all('|<wp:postmeta>(.*?)</wp:postmeta>|is', $post, $postmeta);

4
wp-admin/import/wp-cat2tag.php
View File

@ -65,7 +65,7 @@ class WP_Categories_to_Tags {
if ( $cat_num > 0 ) { if ( $cat_num > 0 ) {
screen_icon(); screen_icon();
echo '<h2>' . sprintf( __ngettext( 'Convert Category to Tag.', 'Convert Categories (%d) to Tags.', $cat_num ), $cat_num ) . '</h2>'; echo '<h2>' . sprintf( _n( 'Convert Category to Tag.', 'Convert Categories (%d) to Tags.', $cat_num ), $cat_num ) . '</h2>';
echo '<div class="narrow">'; echo '<div class="narrow">';
echo '<p>' . __('Hey there. Here you can selectively convert existing categories to tags. To get started, check the categories you wish to be converted, then click the Convert button.') . '</p>'; echo '<p>' . __('Hey there. Here you can selectively convert existing categories to tags. To get started, check the categories you wish to be converted, then click the Convert button.') . '</p>';
echo '<p>' . __('Keep in mind that if you convert a category with child categories, the children become top-level orphans.') . '</p></div>'; echo '<p>' . __('Keep in mind that if you convert a category with child categories, the children become top-level orphans.') . '</p></div>';
@ -141,7 +141,7 @@ function check_all_rows() {
if ( $tags_num > 0 ) { if ( $tags_num > 0 ) {
screen_icon(); screen_icon();
echo '<h2>' . sprintf( __ngettext( 'Convert Tag to Category.', 'Convert Tags (%d) to Categories.', $tags_num ), $tags_num ) . '</h2>'; echo '<h2>' . sprintf( _n( 'Convert Tag to Category.', 'Convert Tags (%d) to Categories.', $tags_num ), $tags_num ) . '</h2>';
echo '<div class="narrow">'; echo '<div class="narrow">';
echo '<p>' . __('Here you can selectively converts existing tags to categories. To get started, check the tags you wish to be converted, then click the Convert button.') . '</p>'; echo '<p>' . __('Here you can selectively converts existing tags to categories. To get started, check the tags you wish to be converted, then click the Convert button.') . '</p>';
echo '<p>' . __('The newly created categories will still be associated with the same posts.') . '</p></div>'; echo '<p>' . __('The newly created categories will still be associated with the same posts.') . '</p></div>';

2
wp-admin/includes/media.php
View File

@ -1690,7 +1690,7 @@ foreach ( $post_mime_types as $mime_type => $label ) {
if ( wp_match_mime_types($mime_type, $_GET['post_mime_type']) ) if ( wp_match_mime_types($mime_type, $_GET['post_mime_type']) )
$class = ' class="current"'; $class = ' class="current"';
$type_links[] = "<li><a href='" . clean_url(add_query_arg(array('post_mime_type'=>$mime_type, 'paged'=>false))) . "'$class>" . sprintf(__ngettext($label[2][0], $label[2][1], $num_posts[$mime_type]), "<span id='$mime_type-counter'>" . number_format_i18n( $num_posts[$mime_type] ) . '</span>') . '</a>'; $type_links[] = "<li><a href='" . clean_url(add_query_arg(array('post_mime_type'=>$mime_type, 'paged'=>false))) . "'$class>" . sprintf(_n($label[2][0], $label[2][1], $num_posts[$mime_type]), "<span id='$mime_type-counter'>" . number_format_i18n( $num_posts[$mime_type] ) . '</span>') . '</a>';
} }
echo implode(' | </li>', $type_links) . '</li>'; echo implode(' | </li>', $type_links) . '</li>';
unset($type_links); unset($type_links);

8
wp-admin/includes/plugin-install.php
View File

@ -338,7 +338,7 @@ function display_plugins_table($plugins, $page = 1, $totalpages = 1){
<td class="name"><?php echo $title; ?></td> <td class="name"><?php echo $title; ?></td>
<td class="vers"><?php echo $version; ?></td> <td class="vers"><?php echo $version; ?></td>
<td class="vers"> <td class="vers">
<div class="star-holder" title="<?php printf(__ngettext('(based on %s rating)', '(based on %s ratings)', $plugin['num_ratings']), number_format_i18n($plugin['num_ratings'])) ?>"> <div class="star-holder" title="<?php printf(_n('(based on %s rating)', '(based on %s ratings)', $plugin['num_ratings']), number_format_i18n($plugin['num_ratings'])) ?>">
<div class="star star-rating" style="width: <?php echo attribute_escape($plugin['rating']) ?>px"></div> <div class="star star-rating" style="width: <?php echo attribute_escape($plugin['rating']) ?>px"></div>
<div class="star star5"><img src="<?php echo admin_url('images/star.gif'); ?>" alt="<?php _e('5 stars') ?>" /></div> <div class="star star5"><img src="<?php echo admin_url('images/star.gif'); ?>" alt="<?php _e('5 stars') ?>" /></div>
<div class="star star4"><img src="<?php echo admin_url('images/star.gif'); ?>" alt="<?php _e('4 stars') ?>" /></div> <div class="star star4"><img src="<?php echo admin_url('images/star.gif'); ?>" alt="<?php _e('4 stars') ?>" /></div>
@ -485,7 +485,7 @@ function install_plugin_information() {
<?php endif; if ( ! empty($api->tested) ) : ?> <?php endif; if ( ! empty($api->tested) ) : ?>
<li><strong><?php _e('Compatible up to:') ?></strong> <?php echo $api->tested ?></li> <li><strong><?php _e('Compatible up to:') ?></strong> <?php echo $api->tested ?></li>
<?php endif; if ( ! empty($api->downloaded) ) : ?> <?php endif; if ( ! empty($api->downloaded) ) : ?>
<li><strong><?php _e('Downloaded:') ?></strong> <?php printf(__ngettext('%s time', '%s times', $api->downloaded), number_format_i18n($api->downloaded)) ?></li> <li><strong><?php _e('Downloaded:') ?></strong> <?php printf(_n('%s time', '%s times', $api->downloaded), number_format_i18n($api->downloaded)) ?></li>
<?php endif; if ( ! empty($api->slug) ) : ?> <?php endif; if ( ! empty($api->slug) ) : ?>
<li><a target="_blank" href="http://wordpress.org/extend/plugins/<?php echo $api->slug ?>/"><?php _e('WordPress.org Plugin Page &#187;') ?></a></li> <li><a target="_blank" href="http://wordpress.org/extend/plugins/<?php echo $api->slug ?>/"><?php _e('WordPress.org Plugin Page &#187;') ?></a></li>
<?php endif; if ( ! empty($api->homepage) ) : ?> <?php endif; if ( ! empty($api->homepage) ) : ?>
@ -493,7 +493,7 @@ function install_plugin_information() {
<?php endif; ?> <?php endif; ?>
</ul> </ul>
<h2><?php _e('Average Rating') ?></h2> <h2><?php _e('Average Rating') ?></h2>
<div class="star-holder" title="<?php printf(__ngettext('(based on %s rating)', '(based on %s ratings)', $api->num_ratings), number_format_i18n($api->num_ratings)); ?>"> <div class="star-holder" title="<?php printf(_n('(based on %s rating)', '(based on %s ratings)', $api->num_ratings), number_format_i18n($api->num_ratings)); ?>">
<div class="star star-rating" style="width: <?php echo attribute_escape($api->rating) ?>px"></div> <div class="star star-rating" style="width: <?php echo attribute_escape($api->rating) ?>px"></div>
<div class="star star5"><img src="<?php echo admin_url('images/star.gif'); ?>" alt="<?php _e('5 stars') ?>" /></div> <div class="star star5"><img src="<?php echo admin_url('images/star.gif'); ?>" alt="<?php _e('5 stars') ?>" /></div>
<div class="star star4"><img src="<?php echo admin_url('images/star.gif'); ?>" alt="<?php _e('4 stars') ?>" /></div> <div class="star star4"><img src="<?php echo admin_url('images/star.gif'); ?>" alt="<?php _e('4 stars') ?>" /></div>
@ -501,7 +501,7 @@ function install_plugin_information() {
<div class="star star2"><img src="<?php echo admin_url('images/star.gif'); ?>" alt="<?php _e('2 stars') ?>" /></div> <div class="star star2"><img src="<?php echo admin_url('images/star.gif'); ?>" alt="<?php _e('2 stars') ?>" /></div>
<div class="star star1"><img src="<?php echo admin_url('images/star.gif'); ?>" alt="<?php _e('1 star') ?>" /></div> <div class="star star1"><img src="<?php echo admin_url('images/star.gif'); ?>" alt="<?php _e('1 star') ?>" /></div>
</div> </div>
<small><?php printf(__ngettext('(based on %s rating)', '(based on %s ratings)', $api->num_ratings), number_format_i18n($api->num_ratings)); ?></small> <small><?php printf(_n('(based on %s rating)', '(based on %s ratings)', $api->num_ratings), number_format_i18n($api->num_ratings)); ?></small>
</div> </div>
<div id="section-holder" class="wrap"> <div id="section-holder" class="wrap">
<?php <?php

16
wp-admin/includes/post.php
View File

@ -774,11 +774,11 @@ function wp_edit_posts_query( $q = false ) {
$q['m'] = isset($q['m']) ? (int) $q['m'] : 0; $q['m'] = isset($q['m']) ? (int) $q['m'] : 0;
$q['cat'] = isset($q['cat']) ? (int) $q['cat'] : 0; $q['cat'] = isset($q['cat']) ? (int) $q['cat'] : 0;
$post_stati = array( // array( adj, noun ) $post_stati = array( // array( adj, noun )
'publish' => array(__('Published'), __('Published posts'), __ngettext_noop('Published <span class="count">(%s)</span>', 'Published <span class="count">(%s)</span>')), 'publish' => array(__('Published'), __('Published posts'), _n_noop('Published <span class="count">(%s)</span>', 'Published <span class="count">(%s)</span>')),
'future' => array(__('Scheduled'), __('Scheduled posts'), __ngettext_noop('Scheduled <span class="count">(%s)</span>', 'Scheduled <span class="count">(%s)</span>')), 'future' => array(__('Scheduled'), __('Scheduled posts'), _n_noop('Scheduled <span class="count">(%s)</span>', 'Scheduled <span class="count">(%s)</span>')),
'pending' => array(__('Pending Review'), __('Pending posts'), __ngettext_noop('Pending Review <span class="count">(%s)</span>', 'Pending Review <span class="count">(%s)</span>')), 'pending' => array(__('Pending Review'), __('Pending posts'), _n_noop('Pending Review <span class="count">(%s)</span>', 'Pending Review <span class="count">(%s)</span>')),
'draft' => array(__('Draft'), _c('Drafts|manage posts header'), __ngettext_noop('Draft <span class="count">(%s)</span>', 'Drafts <span class="count">(%s)</span>')), 'draft' => array(__('Draft'), _c('Drafts|manage posts header'), _n_noop('Draft <span class="count">(%s)</span>', 'Drafts <span class="count">(%s)</span>')),
'private' => array(__('Private'), __('Private posts'), __ngettext_noop('Private <span class="count">(%s)</span>', 'Private <span class="count">(%s)</span>')), 'private' => array(__('Private'), __('Private posts'), _n_noop('Private <span class="count">(%s)</span>', 'Private <span class="count">(%s)</span>')),
); );
$post_stati = apply_filters('post_stati', $post_stati); $post_stati = apply_filters('post_stati', $post_stati);
@ -840,9 +840,9 @@ function wp_edit_attachments_query( $q = false ) {
$q['post_status'] = 'any'; $q['post_status'] = 'any';
$q['posts_per_page'] = 15; $q['posts_per_page'] = 15;
$post_mime_types = array( // array( adj, noun ) $post_mime_types = array( // array( adj, noun )
'image' => array(__('Images'), __('Manage Images'), __ngettext_noop('Image <span class="count">(%s)</span>', 'Images <span class="count">(%s)</span>')), 'image' => array(__('Images'), __('Manage Images'), _n_noop('Image <span class="count">(%s)</span>', 'Images <span class="count">(%s)</span>')),
'audio' => array(__('Audio'), __('Manage Audio'), __ngettext_noop('Audio <span class="count">(%s)</span>', 'Audio <span class="count">(%s)</span>')), 'audio' => array(__('Audio'), __('Manage Audio'), _n_noop('Audio <span class="count">(%s)</span>', 'Audio <span class="count">(%s)</span>')),
'video' => array(__('Video'), __('Manage Video'), __ngettext_noop('Video <span class="count">(%s)</span>', 'Video <span class="count">(%s)</span>')), 'video' => array(__('Video'), __('Manage Video'), _n_noop('Video <span class="count">(%s)</span>', 'Video <span class="count">(%s)</span>')),
); );
$post_mime_types = apply_filters('post_mime_types', $post_mime_types); $post_mime_types = apply_filters('post_mime_types', $post_mime_types);

6
wp-admin/includes/theme-install.php
View File

@ -472,7 +472,7 @@ function install_theme_information() {
<?php endif; if ( ! empty($api->tested) ) : ?> <?php endif; if ( ! empty($api->tested) ) : ?>
<li><strong><?php _e('Compatible up to:') ?></strong> <?php echo $api->tested ?></li> <li><strong><?php _e('Compatible up to:') ?></strong> <?php echo $api->tested ?></li>
<?php endif; if ( ! empty($api->downloaded) ) : ?> <?php endif; if ( ! empty($api->downloaded) ) : ?>
<li><strong><?php _e('Downloaded:') ?></strong> <?php printf(__ngettext('%s time', '%s times', $api->downloaded), number_format_i18n($api->downloaded)) ?></li> <li><strong><?php _e('Downloaded:') ?></strong> <?php printf(_n('%s time', '%s times', $api->downloaded), number_format_i18n($api->downloaded)) ?></li>
<?php endif; if ( ! empty($api->slug) ) : ?> <?php endif; if ( ! empty($api->slug) ) : ?>
<li><a target="_blank" href="http://wordpress.org/extend/themes/<?php echo $api->slug ?>/"><?php _e('WordPress.org Theme Page &#187;') ?></a></li> <li><a target="_blank" href="http://wordpress.org/extend/themes/<?php echo $api->slug ?>/"><?php _e('WordPress.org Theme Page &#187;') ?></a></li>
<?php endif; if ( ! empty($api->homepage) ) : ?> <?php endif; if ( ! empty($api->homepage) ) : ?>
@ -480,7 +480,7 @@ function install_theme_information() {
<?php endif; ?> <?php endif; ?>
</ul> </ul>
<h2><?php _e('Average Rating') ?></h2> <h2><?php _e('Average Rating') ?></h2>
<div class="star-holder" title="<?php printf(__ngettext('(based on %s rating)', '(based on %s ratings)', $api->num_ratings), number_format_i18n($api->num_ratings)); ?>"> <div class="star-holder" title="<?php printf(_n('(based on %s rating)', '(based on %s ratings)', $api->num_ratings), number_format_i18n($api->num_ratings)); ?>">
<div class="star star-rating" style="width: <?php echo attribute_escape($api->rating) ?>px"></div> <div class="star star-rating" style="width: <?php echo attribute_escape($api->rating) ?>px"></div>
<div class="star star5"><img src="<?php echo admin_url('images/star.gif'); ?>" alt="<?php _e('5 stars') ?>" /></div> <div class="star star5"><img src="<?php echo admin_url('images/star.gif'); ?>" alt="<?php _e('5 stars') ?>" /></div>
<div class="star star4"><img src="<?php echo admin_url('images/star.gif'); ?>" alt="<?php _e('4 stars') ?>" /></div> <div class="star star4"><img src="<?php echo admin_url('images/star.gif'); ?>" alt="<?php _e('4 stars') ?>" /></div>
@ -488,7 +488,7 @@ function install_theme_information() {
<div class="star star2"><img src="<?php echo admin_url('images/star.gif'); ?>" alt="<?php _e('2 stars') ?>" /></div> <div class="star star2"><img src="<?php echo admin_url('images/star.gif'); ?>" alt="<?php _e('2 stars') ?>" /></div>
<div class="star star1"><img src="<?php echo admin_url('images/star.gif'); ?>" alt="<?php _e('1 star') ?>" /></div> <div class="star star1"><img src="<?php echo admin_url('images/star.gif'); ?>" alt="<?php _e('1 star') ?>" /></div>
</div> </div>
<small><?php printf(__ngettext('(based on %s rating)', '(based on %s ratings)', $api->num_ratings), number_format_i18n($api->num_ratings)); ?></small> <small><?php printf(_n('(based on %s rating)', '(based on %s ratings)', $api->num_ratings), number_format_i18n($api->num_ratings)); ?></small>
</div> </div>
<div id="section-holder" class="wrap"> <div id="section-holder" class="wrap">
<?php <?php

2
wp-admin/link-manager.php
View File

@ -80,7 +80,7 @@ if ( isset($_GET['s']) && $_GET['s'] )
if ( isset($_GET['deleted']) ) { if ( isset($_GET['deleted']) ) {
echo '<div id="message" class="updated fade"><p>'; echo '<div id="message" class="updated fade"><p>';
$deleted = (int) $_GET['deleted']; $deleted = (int) $_GET['deleted'];
printf(__ngettext('%s link deleted.', '%s links deleted', $deleted), $deleted); printf(_n('%s link deleted.', '%s links deleted', $deleted), $deleted);
echo '</p></div>'; echo '</p></div>';
$_SERVER['REQUEST_URI'] = remove_query_arg(array('deleted'), $_SERVER['REQUEST_URI']); $_SERVER['REQUEST_URI'] = remove_query_arg(array('deleted'), $_SERVER['REQUEST_URI']);
} }

12
wp-admin/upload.php
View File

@ -121,9 +121,9 @@ if ( isset($_GET['detached']) ) {
} }
$post_mime_types = array( $post_mime_types = array(
'image' => array(__('Images'), __('Manage Images'), __ngettext_noop('Image (%s)', 'Images (%s)')), 'image' => array(__('Images'), __('Manage Images'), _n_noop('Image (%s)', 'Images (%s)')),
'audio' => array(__('Audio'), __('Manage Audio'), __ngettext_noop('Audio (%s)', 'Audio (%s)')), 'audio' => array(__('Audio'), __('Manage Audio'), _n_noop('Audio (%s)', 'Audio (%s)')),
'video' => array(__('Video'), __('Manage Video'), __ngettext_noop('Video (%s)', 'Video (%s)')), 'video' => array(__('Video'), __('Manage Video'), _n_noop('Video (%s)', 'Video (%s)')),
); );
$post_mime_types = apply_filters('post_mime_types', $post_mime_types); $post_mime_types = apply_filters('post_mime_types', $post_mime_types);
@ -147,7 +147,7 @@ if ( isset($_GET['posted']) && (int) $_GET['posted'] ) {
if ( isset($_GET['attached']) && (int) $_GET['attached'] ) { if ( isset($_GET['attached']) && (int) $_GET['attached'] ) {
$attached = (int) $_GET['attached']; $attached = (int) $_GET['attached'];
$message = sprintf( __ngettext('Reattached %d attachment', 'Reattached %d attachments', $attached), $attached ); $message = sprintf( _n('Reattached %d attachment', 'Reattached %d attachments', $attached), $attached );
$_SERVER['REQUEST_URI'] = remove_query_arg(array('attached'), $_SERVER['REQUEST_URI']); $_SERVER['REQUEST_URI'] = remove_query_arg(array('attached'), $_SERVER['REQUEST_URI']);
} }
@ -188,7 +188,7 @@ foreach ( $matches as $type => $reals )
$num_posts[$type] = ( isset( $num_posts[$type] ) ) ? $num_posts[$type] + $_num_posts[$real] : $_num_posts[$real]; $num_posts[$type] = ( isset( $num_posts[$type] ) ) ? $num_posts[$type] + $_num_posts[$real] : $_num_posts[$real];
$class = empty($_GET['post_mime_type']) && ! isset($_GET['detached']) ? ' class="current"' : ''; $class = empty($_GET['post_mime_type']) && ! isset($_GET['detached']) ? ' class="current"' : '';
$type_links[] = "<li><a href='upload.php'$class>" . sprintf( __ngettext( 'All <span class="count">(%s)</span>', 'All <span class="count">(%s)</span>', $_total_posts ), number_format_i18n( $_total_posts ) ) . '</a>'; $type_links[] = "<li><a href='upload.php'$class>" . sprintf( _n( 'All <span class="count">(%s)</span>', 'All <span class="count">(%s)</span>', $_total_posts ), number_format_i18n( $_total_posts ) ) . '</a>';
foreach ( $post_mime_types as $mime_type => $label ) { foreach ( $post_mime_types as $mime_type => $label ) {
$class = ''; $class = '';
@ -198,7 +198,7 @@ foreach ( $post_mime_types as $mime_type => $label ) {
if ( !empty($_GET['post_mime_type']) && wp_match_mime_types($mime_type, $_GET['post_mime_type']) ) if ( !empty($_GET['post_mime_type']) && wp_match_mime_types($mime_type, $_GET['post_mime_type']) )
$class = ' class="current"'; $class = ' class="current"';
$type_links[] = "<li><a href='upload.php?post_mime_type=$mime_type'$class>" . sprintf( __ngettext( $label[2][0], $label[2][1], $num_posts[$mime_type] ), number_format_i18n( $num_posts[$mime_type] )) . '</a>'; $type_links[] = "<li><a href='upload.php?post_mime_type=$mime_type'$class>" . sprintf( _n( $label[2][0], $label[2][1], $num_posts[$mime_type] ), number_format_i18n( $num_posts[$mime_type] )) . '</a>';
} }
$class = isset($_GET['detached']) ? ' class="current"' : ''; $class = isset($_GET['detached']) ? ' class="current"' : '';
$type_links[] = '<li><a href="upload.php?detached=1"' . $class . '>' . __('Unattached') . '</a>'; $type_links[] = '<li><a href="upload.php?detached=1"' . $class . '>' . __('Unattached') . '</a>';

4
wp-admin/users.php
View File

@ -202,7 +202,7 @@ default:
case 'del': case 'del':
case 'del_many': case 'del_many':
$delete_count = isset($_GET['delete_count']) ? (int) $_GET['delete_count'] : 0; $delete_count = isset($_GET['delete_count']) ? (int) $_GET['delete_count'] : 0;
$messages[] = '<div id="message" class="updated fade"><p>' . sprintf(__ngettext('%s user deleted', '%s users deleted', $delete_count), $delete_count) . '</p></div>'; $messages[] = '<div id="message" class="updated fade"><p>' . sprintf(_n('%s user deleted', '%s users deleted', $delete_count), $delete_count) . '</p></div>';
break; break;
case 'add': case 'add':
$messages[] = '<div id="message" class="updated fade"><p>' . __('New user created.') . '</p></div>'; $messages[] = '<div id="message" class="updated fade"><p>' . __('New user created.') . '</p></div>';
@ -264,7 +264,7 @@ unset($users_of_blog);
$current_role = false; $current_role = false;
$class = empty($role) ? ' class="current"' : ''; $class = empty($role) ? ' class="current"' : '';
$role_links[] = "<li><a href='users.php'$class>" . sprintf( __ngettext( 'All <span class="count">(%s)</span>', 'All <span class="count">(%s)</span>', $total_users ), number_format_i18n( $total_users ) ) . '</a>'; $role_links[] = "<li><a href='users.php'$class>" . sprintf( _n( 'All <span class="count">(%s)</span>', 'All <span class="count">(%s)</span>', $total_users ), number_format_i18n( $total_users ) ) . '</a>';
foreach ( $wp_roles->get_names() as $this_role => $name ) { foreach ( $wp_roles->get_names() as $this_role => $name ) {
if ( !isset($avail_roles[$this_role]) ) if ( !isset($avail_roles[$this_role]) )
continue; continue;

4
wp-includes/category-template.php
View File

@ -598,7 +598,7 @@ function wp_tag_cloud( $args = '' ) {
* @return string text for the tooltip of a tag link. * @return string text for the tooltip of a tag link.
*/ */
function default_topic_count_text( $count ) { 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 @@ function wp_generate_tag_cloud( $tags, $args = '' ) {
if ( !isset( $args['topic_count_text_callback'] ) && isset( $args['single_text'] ) && isset( $args['multiple_text'] ) ) { if ( !isset( $args['topic_count_text_callback'] ) && isset( $args['single_text'] ) && isset( $args['multiple_text'] ) ) {
$body = 'return sprintf ( $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 ));'; number_format_i18n( $count ));';
$args['topic_count_text_callback'] = create_function('$count', $body); $args['topic_count_text_callback'] = create_function('$count', $body);
} }

6
wp-includes/formatting.php
View File

@ -1473,19 +1473,19 @@ function human_time_diff( $from, $to = '' ) {
if ($mins <= 1) { if ($mins <= 1) {
$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)) { } else if (($diff <= 86400) && ($diff > 3600)) {
$hours = round($diff / 3600); $hours = round($diff / 3600);
if ($hours <= 1) { if ($hours <= 1) {
$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) { } elseif ($diff >= 86400) {
$days = round($diff / 86400); $days = round($diff / 86400);
if ($days <= 1) { if ($days <= 1) {
$days = 1; $days = 1;
} }
$since = sprintf(__ngettext('%s day', '%s days', $days), $days); $since = sprintf(_n('%s day', '%s days', $days), $days);
} }
return $since; return $since;
} }

2
wp-includes/pluggable.php
View File

@ -1038,7 +1038,7 @@ function wp_notify_moderator($comment_id) {
$notify_message .= sprintf( __('Delete it: %s'), admin_url("comment.php?action=cdc&c=$comment_id") ) . "\r\n"; $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( __('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"; '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"; $notify_message .= admin_url("edit-comments.php?comment_status=moderated") . "\r\n";