Changeset 16073 for trunk/wp-includes/l10n.php

Timestamp:

10/29/2010 01:12:14 PM (11 years ago)

Author:

nbachiyski

Message:

Introduce and use translate_nooped_plural(). Fixes #13996

• _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

File:

• trunk/wp-includes/l10n.php (modified) (3 diffs)

trunk/wp-includes/l10n.php

@@ -268 +268 @@
  *  ...
  *  $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
@@ -275 +275 @@
  * @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 );
 }
 
@@ -284 +284 @@
  * @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 );
 }