vhad/wordpress-develop
1
0
Fork 0
mirror of https://github.com/gosticks/wordpress-develop.git synced 2026-10-06 23:58:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Introduce and use translate_nooped_plural(). Fixes #13996

Browse Source 
* _n_noop() and _nx_noop() now return associative arrays for greater clarity
 * translate_nooped_plural() takes one such associative array and translates it
 * it works on both the result from _n_noop() and from _nx_noop()
 * this breaks backwards compatibility, but I doubt any plugin uses it (I will do a global grep to confirm)
 * translate_nooped_plural() is applied where applicable


git-svn-id: https://develop.svn.wordpress.org/trunk@16073 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Nikolay Bachiyski
2010-10-29 13:12:14 +00:00
parent 5e54944621
commit 1937c1221d
5 changed files with 24 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
wp-includes/l10n.php
+20 -5
View File
@@ -267,15 +267,15 @@ function _nx($single, $plural, $number, $context, $domain = 'default') {
* );
* ...
* $message = $messages[$type];
* $usable_text = sprintf(_n($message[0], $message[1], $count), $count);
* $usable_text = sprintf( translate_nooped_plural( $message, $count ), $count );
*
* @since 2.5
* @param string $single Single form to be i18ned
* @param string $plural Plural form to be i18ned
* @return array array($single, $plural)
*/
function _n_noop( $single, $plural ) {
return array( $single, $plural );
function _n_noop( $singular, $plural ) {
return array( 'singular' => $singular, 'plural' => $plural, 'context' => null );
}
/**
@@ -283,8 +283,23 @@ function _n_noop( $single, $plural ) {
*
* @see _n_noop()
*/
function _nx_noop( $single, $plural, $context ) {
return array( $single, $plural, $context );
function _nx_noop( $singular, $plural, $context ) {
return array( 'singular' => $singular, 'plural' => $plural, 'context' => $context );
}
/**
* Translate the result of _n_noop() or _nx_noop()
*
* @since 3.1
* @param array $nooped_plural array with singular, plural and context keys, usually the result of _n_noop() or _nx_noop()
* @param int $count number of objects
* @param string $domain Optional. The domain identifier the text should be retrieved in
*/
function translate_nooped_plural( $nooped_plural, $count, $domain = 'default' ) {
if ( $nooped_plural['context'] )
return _nx( $nooped_plural['singular'], $nooped_plural['plural'], $count, $nooped_plural['context'], $domain );
else
return _n( $nooped_plural['singular'], $nooped_plural['plural'], $count, $domain );
}
/**