Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-06-21 04:15:01 +02:00
Code Issues Projects Releases Wiki Activity

Deprecate _nc() as _nx() is a much better was of specifying contexts. Fixes #11404 props nacin.

Browse Source 
git-svn-id: http://svn.automattic.com/wordpress/trunk@12459 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
westi 2009-12-19 10:51:29 +00:00
parent 8151a3c8c6
commit 10a6d0e916
3 changed files with 25 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -260,7 +260,7 @@ function wp_dashboard_right_now() {
// Approved Comments
$num = '<span class="approved-count">' . number_format_i18n($num_comm->approved) . '</span>';
$text = _nc( 'Approved|Right Now', 'Approved', $num_comm->approved );
$text = _nx( 'Approved', 'Approved', $num_comm->approved, 'Right Now' );
if ( current_user_can( 'moderate_comments' ) ) {
$num = "<a href='edit-comments.php?comment_status=approved'>$num</a>";
$text = "<a class='approved' href='edit-comments.php?comment_status=approved'>$text</a>";

21
wp-includes/deprecated.php
View File

@ -1801,6 +1801,8 @@ function make_url_footnote( $content ) {
*
* @since 2.2.0
* @deprecated 2.9.0
* @deprecated Use _x()
* @see _x()
*
* @param string $text Text to translate
* @param string $domain Optional. Domain to retrieve the translated text
@ -1810,4 +1812,21 @@ function _c( $text, $domain = 'default' ) {
_deprecated_function(__FUNCTION__, '2.9', '_x' );
return translate_with_context( $text, $domain );
}
?>
/**
* A version of _n(), which supports contexts.
* Strips everything from the translation after the last bar.
*
* @since 2.7.0
* @deprecated 3.0.0
* @deprecated Use _nx()
* @see _nx()
* @see _n() For parameters.
* @see _c() For parameters. _c() is deprecated.
*
*/
function _nc( $single, $plural, $number, $domain = 'default' ) {
_deprecated_function(__FUNCTION__, '2.9', '_nx' );
return before_last_bar( _n( $single, $plural, $number, $domain ) );
}
?>

10
wp-includes/l10n.php
View File

@ -239,14 +239,12 @@ function _n( $single, $plural, $number, $domain = 'default' ) {
}
/**
* @see _n() A version of _n(), which supports contexts --
* strips everything from the translation after the last bar
* A hybrid of _n() and _x(). It supports contexts and plurals.
*
* @see _n()
* @see _x()
*
*/
function _nc( $single, $plural, $number, $domain = 'default' ) {
return before_last_bar( _n( $single, $plural, $number, $domain ) );
}
function _nx($single, $plural, $number, $context, $domain = 'default') {
$translations = &get_translations_for_domain( $domain );
$translation = $translations->translate_plural( $single, $plural, $number, $context );