Ticket #9111: deprecate-longer-ngettext-functions.diff

wp-includes/l10n.php

@@ -149 +149 @@
         return translate_with_context($text, $domain);
 }
 
+function __ngettext() {
+        _deprecated_function( __FUNCTION__, '2.8', '_n()' );
+        $args = func_get_args();
+        return call_user_func_array('_n', $args);
+}
+
 /**
  * Retrieve the plural or single form based on the amount.
  *
@@ -171 +177 @@
  * @param string $domain Optional. The domain identifier the text should be retrieved in
  * @return string Either $single or $plural translated text
  */
-function __ngettext($single, $plural, $number, $domain = 'default') {
+function _n($single, $plural, $number, $domain = 'default') {
         global $l10n;
 
         if (isset($l10n[$domain])) {
@@ -185 +191 @@
 }
 
 /**
- * @see __ngettext() An alias of __ngettext
+ * @see _n() A version of _n(), which supports contexts --
+ * strips everything from the translation after the last bar
  *
  */
-function _n() {
-        $args = func_get_args();
-        return call_user_func_array('__ngettext', $args);
+function _nc( $single, $plural, $number, $domain = 'default' ) {
+        return before_last_bar( _n( $single, $plural, $number, $domain ) );
 }
 
 /**
- * @see _n() A version of _n(), which supports contexts --
- * strips everything from the translation after the last bar
- *
+ * @deprecated Use _n_noop()
  */
-function _nc( $single, $plural, $number, $domain = 'default' ) {
-        return before_last_bar( __ngettext( $single, $plural, $number, $domain ) );
+function __ngettext_noop() {
+        _deprecated_function( __FUNCTION__, '2.8', '_n_noop()' );
+        $args = func_get_args();
+        return call_user_func_array('_n_noop', $args);
+
 }
 
 /**
@@ -210 +217 @@
  *
  * Example:
  *  $messages = array(
- *      'post' => ngettext_noop('%s post', '%s posts'),
- *      'page' => ngettext_noop('%s pages', '%s pages')
+ *      'post' => _n_noop('%s post', '%s posts'),
+ *      'page' => _n_noop('%s pages', '%s pages')
  *  );
  *  ...
  *  $message = $messages[$type];
- *  $usable_text = sprintf(__ngettext($message[0], $message[1], $count), $count);
+ *  $usable_text = sprintf(_n($message[0], $message[1], $count), $count);
  *
  * @since 2.5
  * @param $single Single form to be i18ned
  * @param $plural Plural form to be i18ned
- * @param $number Not used, here for compatibility with __ngettext, optional
- * @param $domain Not used, here for compatibility with __ngettext, optional
+ * @param $number Not used, here for compatibility with _n, optional
+ * @param $domain Not used, here for compatibility with _n, optional
  * @return array array($single, $plural)
  */
-function __ngettext_noop($single, $plural, $number=1, $domain = 'default') {
-        return array($single, $plural);
+function _n_noop( $single, $plural, $number = 1, $domain = 'default' ) {
+        return array( $single, $plural );
 }
 
 /**
- * @see __ngettext_noop() An alias of __ngettext_noop()
- *
- */
-function _n_noop() {
-        $args = func_get_args();
-        return call_user_func_array('__ngettext_noop', $args);
-}
-
-/**
  * Loads MO file into the list of domains.
  *
  * If the domain already exists, the inclusion will fail. If the MO file is not