<!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>[40028] trunk/src: I18N: Merge similar strings in `_deprecated_argument()` calls.</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/40028">40028</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/40028","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>SergeyBiryukov</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2017-01-29 11:49:49 +0000 (Sun, 29 Jan 2017)</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'>I18N: Merge similar strings in `_deprecated_argument()` calls.
Add translator comments.
Props ramiy, SergeyBiryukov.
Fixes <a href="https://core.trac.wordpress.org/ticket/39020">#39020</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminincludestemplatephp">trunk/src/wp-admin/includes/template.php</a></li>
<li><a href="#trunksrcwpincludescategorytemplatephp">trunk/src/wp-includes/category-template.php</a></li>
<li><a href="#trunksrcwpincludescategoryphp">trunk/src/wp-includes/category.php</a></li>
<li><a href="#trunksrcwpincludesclasswpqueryphp">trunk/src/wp-includes/class-wp-query.php</a></li>
<li><a href="#trunksrcwpincludesoptionphp">trunk/src/wp-includes/option.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminincludestemplatephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/template.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/template.php 2017-01-29 10:58:04 UTC (rev 40027)
+++ trunk/src/wp-admin/includes/template.php 2017-01-29 11:49:49 UTC (rev 40028)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1207,12 +1207,22 @@
</span><span class="cx" style="display: block; padding: 0 10px"> global $wp_settings_sections;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'misc' == $page ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- _deprecated_argument( __FUNCTION__, '3.0.0', sprintf( __( 'The "%s" options group has been removed. Use another settings group.' ), 'misc' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ _deprecated_argument( __FUNCTION__, '3.0.0',
+ /* translators: %s: misc */
+ sprintf( __( 'The "%s" options group has been removed. Use another settings group.' ),
+ 'misc'
+ )
+ );
</ins><span class="cx" style="display: block; padding: 0 10px"> $page = 'general';
</span><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"> if ( 'privacy' == $page ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- _deprecated_argument( __FUNCTION__, '3.5.0', sprintf( __( 'The "%s" options group has been removed. Use another settings group.' ), 'privacy' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ _deprecated_argument( __FUNCTION__, '3.5.0',
+ /* translators: %s: privacy */
+ sprintf( __( 'The "%s" options group has been removed. Use another settings group.' ),
+ 'privacy'
+ )
+ );
</ins><span class="cx" style="display: block; padding: 0 10px"> $page = 'reading';
</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">@@ -1258,12 +1268,22 @@
</span><span class="cx" style="display: block; padding: 0 10px"> global $wp_settings_fields;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'misc' == $page ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- _deprecated_argument( __FUNCTION__, '3.0.0', __( 'The miscellaneous options group has been removed. Use another settings group.' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ _deprecated_argument( __FUNCTION__, '3.0.0',
+ /* translators: %s: misc */
+ sprintf( __( 'The "%s" options group has been removed. Use another settings group.' ),
+ 'misc'
+ )
+ );
</ins><span class="cx" style="display: block; padding: 0 10px"> $page = 'general';
</span><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"> if ( 'privacy' == $page ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- _deprecated_argument( __FUNCTION__, '3.5.0', __( 'The privacy options group has been removed. Use another settings group.' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ _deprecated_argument( __FUNCTION__, '3.5.0',
+ /* translators: %s: privacy */
+ sprintf( __( 'The "%s" options group has been removed. Use another settings group.' ),
+ 'privacy'
+ )
+ );
</ins><span class="cx" style="display: block; padding: 0 10px"> $page = 'reading';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpincludescategorytemplatephp"></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/category-template.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/category-template.php 2017-01-29 10:58:04 UTC (rev 40027)
+++ trunk/src/wp-includes/category-template.php 2017-01-29 11:49:49 UTC (rev 40028)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -342,8 +342,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Back compat.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $args['type'] ) && 'link' == $args['type'] ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: 1: "type => link", 2: "taxonomy => link_category" alternative */
</del><span class="cx" style="display: block; padding: 0 10px"> _deprecated_argument( __FUNCTION__, '3.0.0',
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: 1: "type => link", 2: "taxonomy => link_category" */
</ins><span class="cx" style="display: block; padding: 0 10px"> sprintf( __( '%1$s is deprecated. Use %2$s instead.' ),
</span><span class="cx" style="display: block; padding: 0 10px"> '<code>type => link</code>',
</span><span class="cx" style="display: block; padding: 0 10px"> '<code>taxonomy => link_category</code>'
</span></span></pre></div>
<a id="trunksrcwpincludescategoryphp"></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/category.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/category.php 2017-01-29 10:58:04 UTC (rev 40027)
+++ trunk/src/wp-includes/category.php 2017-01-29 11:49:49 UTC (rev 40028)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -41,8 +41,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Back compat
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset($args['type']) && 'link' == $args['type'] ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: 1: "type => link", 2: "taxonomy => link_category" alternative */
</del><span class="cx" style="display: block; padding: 0 10px"> _deprecated_argument( __FUNCTION__, '3.0.0',
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: 1: "type => link", 2: "taxonomy => link_category" */
</ins><span class="cx" style="display: block; padding: 0 10px"> sprintf( __( '%1$s is deprecated. Use %2$s instead.' ),
</span><span class="cx" style="display: block; padding: 0 10px"> '<code>type => link</code>',
</span><span class="cx" style="display: block; padding: 0 10px"> '<code>taxonomy => link_category</code>'
</span></span></pre></div>
<a id="trunksrcwpincludesclasswpqueryphp"></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/class-wp-query.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-query.php 2017-01-29 10:58:04 UTC (rev 40027)
+++ trunk/src/wp-includes/class-wp-query.php 2017-01-29 11:49:49 UTC (rev 40028)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1713,9 +1713,17 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $page = 1;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $q['caller_get_posts'] ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- _deprecated_argument( 'WP_Query', '3.1.0', __( '"caller_get_posts" is deprecated. Use "ignore_sticky_posts" instead.' ) );
- if ( !isset( $q['ignore_sticky_posts'] ) )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ _deprecated_argument( 'WP_Query', '3.1.0',
+ /* translators: 1: caller_get_posts, 2: ignore_sticky_posts */
+ sprintf( __( '%1$s is deprecated. Use %2$s instead.' ),
+ '<code>caller_get_posts</code>',
+ '<code>ignore_sticky_posts</code>'
+ )
+ );
+
+ if ( ! isset( $q['ignore_sticky_posts'] ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $q['ignore_sticky_posts'] = $q['caller_get_posts'];
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</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"> if ( !isset( $q['ignore_sticky_posts'] ) )
</span></span></pre></div>
<a id="trunksrcwpincludesoptionphp"></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/option.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/option.php 2017-01-29 10:58:04 UTC (rev 40027)
+++ trunk/src/wp-includes/option.php 2017-01-29 11:49:49 UTC (rev 40028)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1913,12 +1913,22 @@
</span><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"> if ( 'misc' == $option_group ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- _deprecated_argument( __FUNCTION__, '3.0.0', sprintf( __( 'The "%s" options group has been removed. Use another settings group.' ), 'misc' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ _deprecated_argument( __FUNCTION__, '3.0.0',
+ /* translators: %s: misc */
+ sprintf( __( 'The "%s" options group has been removed. Use another settings group.' ),
+ 'misc'
+ )
+ );
</ins><span class="cx" style="display: block; padding: 0 10px"> $option_group = 'general';
</span><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"> if ( 'privacy' == $option_group ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- _deprecated_argument( __FUNCTION__, '3.5.0', sprintf( __( 'The "%s" options group has been removed. Use another settings group.' ), 'privacy' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ _deprecated_argument( __FUNCTION__, '3.5.0',
+ /* translators: %s: privacy */
+ sprintf( __( 'The "%s" options group has been removed. Use another settings group.' ),
+ 'privacy'
+ )
+ );
</ins><span class="cx" style="display: block; padding: 0 10px"> $option_group = 'reading';
</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">@@ -1949,12 +1959,22 @@
</span><span class="cx" style="display: block; padding: 0 10px"> global $new_whitelist_options, $wp_registered_settings;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'misc' == $option_group ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- _deprecated_argument( __FUNCTION__, '3.0.0', sprintf( __( 'The "%s" options group has been removed. Use another settings group.' ), 'misc' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ _deprecated_argument( __FUNCTION__, '3.0.0',
+ /* translators: %s: misc */
+ sprintf( __( 'The "%s" options group has been removed. Use another settings group.' ),
+ 'misc'
+ )
+ );
</ins><span class="cx" style="display: block; padding: 0 10px"> $option_group = 'general';
</span><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"> if ( 'privacy' == $option_group ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- _deprecated_argument( __FUNCTION__, '3.5.0', sprintf( __( 'The "%s" options group has been removed. Use another settings group.' ), 'privacy' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ _deprecated_argument( __FUNCTION__, '3.5.0',
+ /* translators: %s: privacy */
+ sprintf( __( 'The "%s" options group has been removed. Use another settings group.' ),
+ 'privacy'
+ )
+ );
</ins><span class="cx" style="display: block; padding: 0 10px"> $option_group = 'reading';
</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">@@ -1963,7 +1983,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> unset( $new_whitelist_options[ $option_group ][ $pos ] );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> if ( '' !== $deprecated ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- _deprecated_argument( __FUNCTION__, '4.7.0', __( '$sanitize_callback is deprecated. The callback from register_setting() is used instead.' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ _deprecated_argument( __FUNCTION__, '4.7.0',
+ /* translators: 1: $sanitize_callback, 2: register_setting() */
+ sprintf( __( '%1$s is deprecated. The callback from %2$s is used instead.' ),
+ '<code>$sanitize_callback</code>',
+ '<code>register_setting()</code>'
+ )
+ );
</ins><span class="cx" style="display: block; padding: 0 10px"> remove_filter( "sanitize_option_{$option_name}", $deprecated );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre>
</div>
</div>
</body>
</html>