<!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" />
<title>[38360] trunk/src/wp-includes/l10n.php: L10N: improve accuracy of docs.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { 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 #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#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>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/38360">38360</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/38360","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>wonderboymusic</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2016-08-26 09:37:30 +0000 (Fri, 26 Aug 2016)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>L10N: improve accuracy of docs.
Props johnbillion.
Fixes <a href="https://core.trac.wordpress.org/ticket/37585">#37585</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesl10nphp">trunk/src/wp-includes/l10n.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesl10nphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/l10n.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/l10n.php 2016-08-26 09:34:44 UTC (rev 38359)
+++ trunk/src/wp-includes/l10n.php 2016-08-26 09:37:30 UTC (rev 38360)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -91,18 +91,18 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function translate( $text, $domain = 'default' ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $translations = get_translations_for_domain( $domain );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $translations = $translations->translate( $text );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $translation = $translations->translate( $text );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Filters text with its translation.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.0.11
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param string $translations Translated text.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $translation Translated text.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param string $text Text to translate.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $domain Text domain. Unique identifier for retrieving translated strings.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return apply_filters( 'gettext', $translations, $text, $domain );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return apply_filters( 'gettext', $translation, $text, $domain );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -143,18 +143,18 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function translate_with_gettext_context( $text, $context, $domain = 'default' ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $translations = get_translations_for_domain( $domain );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $translations = $translations->translate( $text, $context );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $translation = $translations->translate( $text, $context );
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Filters text with its translation based on context information.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.8.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param string $translations Translated text.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $translation Translated text.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param string $text Text to translate.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $context Context information for the translators.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $domain Text domain. Unique identifier for retrieving translated strings.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return apply_filters( 'gettext_with_context', $translations, $text, $context, $domain );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return apply_filters( 'gettext_with_context', $translation, $text, $context, $domain );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -318,7 +318,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * Example:
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * $people = sprintf( _n( '%s person', '%s people', $count, 'text-domain' ), number_format_i18n( $count ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * printf( _n( '%s person', '%s people', $count, 'text-domain' ), number_format_i18n( $count ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.8.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -331,7 +331,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function _n( $single, $plural, $number, $domain = 'default' ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $translations = get_translations_for_domain( $domain );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $translation = $translations->translate_plural( $single, $plural, $number );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $translation = $translations->translate_plural( $single, $plural, $number );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Filters the singular or plural form of a string.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -355,9 +355,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Used when you want to use the appropriate form of a string with context based on whether a
</span><span class="cx" style="display: block; padding: 0 10px"> * number is singular or plural.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Example:
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Example of a generic phrase which is disambiguated via the context parameter:
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * $people = sprintf( _n( '%s person', '%s people', $count, 'context', 'text-domain' ), number_format_i18n( $count ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * printf( _nx( '%s group', '%s groups', $people, 'group of people', 'text-domain' ), number_format_i18n( $people ) );
+ * printf( _nx( '%s group', '%s groups', $animals, 'group of animals', 'text-domain' ), number_format_i18n( $animals ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.8.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -371,7 +372,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function _nx($single, $plural, $number, $context, $domain = 'default') {
</span><span class="cx" style="display: block; padding: 0 10px"> $translations = get_translations_for_domain( $domain );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $translation = $translations->translate_plural( $single, $plural, $number, $context );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $translation = $translations->translate_plural( $single, $plural, $number, $context );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Filters the singular or plural form of a string with gettext context.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -396,13 +397,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * Example:
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * $messages = array(
- * 'post' => _n_noop( '%s post', '%s posts', 'text-domain' ),
- * 'page' => _n_noop( '%s pages', '%s pages', 'text-domain' ),
- * );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * $message = _n_noop( '%s post', '%s posts', 'text-domain' );
</ins><span class="cx" style="display: block; padding: 0 10px"> * ...
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * $message = $messages[ $type ];
- * $usable_text = sprintf( translate_nooped_plural( $message, $count, 'text-domain' ), number_format_i18n( $count ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * printf( translate_nooped_plural( $message, $count, 'text-domain' ), number_format_i18n( $count ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.5.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -431,15 +428,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Used when you want to keep structures with translatable plural
</span><span class="cx" style="display: block; padding: 0 10px"> * strings and use them later when the number is known.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Example:
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Example of a generic phrase which is disambiguated via the context parameter:
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * $messages = array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * 'post' => _n_noop( '%s post', '%s posts', 'context', 'text-domain' ),
- * 'page' => _n_noop( '%s pages', '%s pages', 'context', 'text-domain' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * 'people' => _nx_noop( '%s group', '%s groups', 'people', 'text-domain' ),
+ * 'animals' => _nx_noop( '%s group', '%s groups', 'animals', 'text-domain' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> * );
</span><span class="cx" style="display: block; padding: 0 10px"> * ...
</span><span class="cx" style="display: block; padding: 0 10px"> * $message = $messages[ $type ];
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * $usable_text = sprintf( translate_nooped_plural( $message, $count, 'text-domain' ), number_format_i18n( $count ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * printf( translate_nooped_plural( $message, $count, 'text-domain' ), number_format_i18n( $count ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.8.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -472,13 +469,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * Example:
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * $messages = array(
- * 'post' => _n_noop( '%s post', '%s posts', 'text-domain' ),
- * 'page' => _n_noop( '%s pages', '%s pages', 'text-domain' ),
- * );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * $message = _n_noop( '%s post', '%s posts', 'text-domain' );
</ins><span class="cx" style="display: block; padding: 0 10px"> * ...
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * $message = $messages[ $type ];
- * $usable_text = sprintf( translate_nooped_plural( $message, $count, 'text-domain' ), number_format_i18n( $count ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * printf( translate_nooped_plural( $message, $count, 'text-domain' ), number_format_i18n( $count ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 3.1.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span></span></pre>
</div>
</div>
</body>
</html>