<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[12459] trunk: Deprecate _nc() as _nx()
is a much better was of specifying contexts.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/12459">12459</a></dd>
<dt>Author</dt> <dd>westi</dd>
<dt>Date</dt> <dd>2009-12-19 10:51:29 +0000 (Sat, 19 Dec 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>Deprecate _nc() as _nx() is a much better was of specifying contexts. Fixes <a href="http://trac.wordpress.org/ticket/11404">#11404</a> props nacin.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminincludesdashboardphp">trunk/wp-admin/includes/dashboard.php</a></li>
<li><a href="#trunkwpincludesdeprecatedphp">trunk/wp-includes/deprecated.php</a></li>
<li><a href="#trunkwpincludesl10nphp">trunk/wp-includes/l10n.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminincludesdashboardphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/dashboard.php (12458 => 12459)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/dashboard.php 2009-12-19 09:23:03 UTC (rev 12458)
+++ trunk/wp-admin/includes/dashboard.php 2009-12-19 10:51:29 UTC (rev 12459)
</span><span class="lines">@@ -260,7 +260,7 @@
</span><span class="cx">
</span><span class="cx"> // Approved Comments
</span><span class="cx"> $num = '<span class="approved-count">' . number_format_i18n($num_comm->approved) . '</span>';
</span><del>- $text = _nc( 'Approved|Right Now', 'Approved', $num_comm->approved );
</del><ins>+ $text = _nx( 'Approved', 'Approved', $num_comm->approved, 'Right Now' );
</ins><span class="cx"> if ( current_user_can( 'moderate_comments' ) ) {
</span><span class="cx"> $num = "<a href='edit-comments.php?comment_status=approved'>$num</a>";
</span><span class="cx"> $text = "<a class='approved' href='edit-comments.php?comment_status=approved'>$text</a>";
</span></span></pre></div>
<a id="trunkwpincludesdeprecatedphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/deprecated.php (12458 => 12459)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/deprecated.php 2009-12-19 09:23:03 UTC (rev 12458)
+++ trunk/wp-includes/deprecated.php 2009-12-19 10:51:29 UTC (rev 12459)
</span><span class="lines">@@ -1801,6 +1801,8 @@
</span><span class="cx"> *
</span><span class="cx"> * @since 2.2.0
</span><span class="cx"> * @deprecated 2.9.0
</span><ins>+ * @deprecated Use _x()
+ * @see _x()
</ins><span class="cx"> *
</span><span class="cx"> * @param string $text Text to translate
</span><span class="cx"> * @param string $domain Optional. Domain to retrieve the translated text
</span><span class="lines">@@ -1810,4 +1812,21 @@
</span><span class="cx"> _deprecated_function(__FUNCTION__, '2.9', '_x' );
</span><span class="cx"> return translate_with_context( $text, $domain );
</span><span class="cx"> }
</span><del>-?>
</del><span class="cx">\ No newline at end of file
</span><ins>+
+/**
+ * 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 ) );
+}
+?>
</ins></span></pre></div>
<a id="trunkwpincludesl10nphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/l10n.php (12458 => 12459)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/l10n.php 2009-12-19 09:23:03 UTC (rev 12458)
+++ trunk/wp-includes/l10n.php 2009-12-19 10:51:29 UTC (rev 12459)
</span><span class="lines">@@ -239,14 +239,12 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * @see _n() A version of _n(), which supports contexts --
- * strips everything from the translation after the last bar
</del><ins>+ * A hybrid of _n() and _x(). It supports contexts and plurals.
</ins><span class="cx"> *
</span><ins>+ * @see _n()
+ * @see _x()
+ *
</ins><span class="cx"> */
</span><del>-function _nc( $single, $plural, $number, $domain = 'default' ) {
- return before_last_bar( _n( $single, $plural, $number, $domain ) );
-}
-
</del><span class="cx"> function _nx($single, $plural, $number, $context, $domain = 'default') {
</span><span class="cx"> $translations = &get_translations_for_domain( $domain );
</span><span class="cx"> $translation = $translations->translate_plural( $single, $plural, $number, $context );
</span></span></pre>
</div>
</div>
</body>
</html>