Ticket #8128: contextual-ngettext.diff

wp-includes/l10n.php

@@ -70 +70 @@
                 return apply_filters('gettext', $text, $text, $domain);
 }
 
+function before_last_bar( $string ) {
+        $last_bar = strrpos( $string, '|' );
+        if ( false == $last_bar )
+                return $string;
+        else
+                return substr( $string, 0, $last_bar );
+}
+
 /**
  * Retrieve the translated text and strip context.
  *
@@ -86 +94 @@
  * @param string $domain Domain to retrieve the translated text
  * @return string Translated text
  */
-function translate_with_context($text, $domain = 'default') {
-        $whole = translate($text, $domain);
-        $last_bar = strrpos($whole, '|');
-        if ( false == $last_bar ) {
-                return $whole;
-        } else {
-                return substr($whole, 0, $last_bar);
-        }
+function translate_with_context( $text, $domain = 'default' ) {
+        return before_last_bar( translate( $text, $domain ) );
+
 }
 
 /**
@@ -182 +185 @@
 }
 
 /**
+ * @see __ngettext() An alias of __ngettext
+ *
+ */
+function _n() {
+        $args = func_get_args();
+        return call_user_func_array('__ngettext', $args);
+}
+
+/**
+ * @see _n() A version of _n(), which supports contexts --
+ * strips everything from the translation after the last bar
+ *
+ */
+function _nc( $single, $plural, $number, $domain = 'default' ) {
+        return before_last_bar( __ngettext( $single, $plural, $number, $domain ) );
+}
+
+/**
  * Register plural strings in POT file, but don't translate them.
  *
  * Used when you want do keep structures with translatable plural strings and
@@ -208 +229 @@
 }
 
 /**
+ * @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