<!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>[12257] trunk/wp-includes: Mark _c()
as Deprecated people should use the new _x() instead.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/12257">12257</a></dd>
<dt>Author</dt> <dd>westi</dd>
<dt>Date</dt> <dd>2009-11-22 12:07:41 +0000 (Sun, 22 Nov 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>Mark _c() as Deprecated people should use the new _x() instead. Fixes <a href="http://trac.wordpress.org/ticket/11225">#11225</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<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="trunkwpincludesdeprecatedphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/deprecated.php (12256 => 12257)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/deprecated.php 2009-11-22 11:50:16 UTC (rev 12256)
+++ trunk/wp-includes/deprecated.php 2009-11-22 12:07:41 UTC (rev 12257)
</span><span class="lines">@@ -1786,4 +1786,28 @@
</span><span class="cx"> return $content;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+/**
+ * Retrieve translated string with vertical bar context
+ *
+ * Quite a few times, there will be collisions with similar translatable text
+ * found in more than two places but with different translated context.
+ *
+ * In order to use the separate contexts, the _c() function is used and the
+ * translatable string uses a pipe ('|') which has the context the string is in.
+ *
+ * When the translated string is returned, it is everything before the pipe, not
+ * including the pipe character. If there is no pipe in the translated text then
+ * everything is returned.
+ *
+ * @since 2.2.0
+ * @deprecated 2.9.0
+ *
+ * @param string $text Text to translate
+ * @param string $domain Optional. Domain to retrieve the translated text
+ * @return string Translated context string without pipe
+ */
+function _c( $text, $domain = 'default' ) {
+ _deprecated_function(__FUNCTION__, '2.9', '_x' );
+ return translate_with_context( $text, $domain );
+}
</ins><span class="cx"> ?>
</span><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkwpincludesl10nphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/l10n.php (12256 => 12257)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/l10n.php 2009-11-22 11:50:16 UTC (rev 12256)
+++ trunk/wp-includes/l10n.php 2009-11-22 12:07:41 UTC (rev 12257)
</span><span class="lines">@@ -176,27 +176,21 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Retrieve translated string with vertical bar context
</del><ins>+ * Retrieve translated string with gettext context
</ins><span class="cx"> *
</span><span class="cx"> * Quite a few times, there will be collisions with similar translatable text
</span><span class="cx"> * found in more than two places but with different translated context.
</span><span class="cx"> *
</span><del>- * In order to use the separate contexts, the _c() function is used and the
- * translatable string uses a pipe ('|') which has the context the string is in.
</del><ins>+ * By including the context in the pot file translators can translate the two
+ * string differently
</ins><span class="cx"> *
</span><del>- * When the translated string is returned, it is everything before the pipe, not
- * including the pipe character. If there is no pipe in the translated text then
- * everything is returned.
</del><ins>+ * @since 2.8
</ins><span class="cx"> *
</span><del>- * @since 2.2.0
- *
</del><span class="cx"> * @param string $text Text to translate
</span><ins>+ * @param string $context Context information for the translators
</ins><span class="cx"> * @param string $domain Optional. Domain to retrieve the translated text
</span><span class="cx"> * @return string Translated context string without pipe
</span><span class="cx"> */
</span><del>-function _c( $text, $domain = 'default' ) {
- return translate_with_context( $text, $domain );
-}
</del><span class="cx">
</span><span class="cx"> function _x( $single, $context, $domain = 'default' ) {
</span><span class="cx"> return translate_with_gettext_context( $single, $context, $domain );
</span></span></pre>
</div>
</div>
</body>
</html>