<!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>[35376] trunk/src: After [34891], rename new post type and taxonomy label keys to match the default strings.</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/35376">35376</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/35376","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>2015-10-23 16:47:57 +0000 (Fri, 23 Oct 2015)</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'>After <a href="https://core.trac.wordpress.org/changeset/34891">[34891]</a>, rename new post type and taxonomy label keys to match the default strings.
See <a href="https://core.trac.wordpress.org/ticket/32147">#32147</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminedittagsphp">trunk/src/wp-admin/edit-tags.php</a></li>
<li><a href="#trunksrcwpadmineditphp">trunk/src/wp-admin/edit.php</a></li>
<li><a href="#trunksrcwpincludespostfunctionsphp">trunk/src/wp-includes/post-functions.php</a></li>
<li><a href="#trunksrcwpincludestaxonomyfunctionsphp">trunk/src/wp-includes/taxonomy-functions.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminedittagsphp"></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/edit-tags.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/edit-tags.php 2015-10-23 15:42:51 UTC (rev 35375)
+++ trunk/src/wp-admin/edit-tags.php 2015-10-23 16:47:57 UTC (rev 35376)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -55,8 +55,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> add_screen_option( 'per_page', array( 'default' => 20, 'option' => 'edit_' . $tax->name . '_per_page' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> get_current_screen()->set_screen_reader_content( array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'heading_pagination' => $tax->labels->pagination,
- 'heading_list' => $tax->labels->list,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'heading_pagination' => $tax->labels->items_list_navigation,
+ 'heading_list' => $tax->labels->items_list,
</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"> $location = false;
</span></span></pre></div>
<a id="trunksrcwpadmineditphp"></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/edit.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/edit.php 2015-10-23 15:42:51 UTC (rev 35375)
+++ trunk/src/wp-admin/edit.php 2015-10-23 16:47:57 UTC (rev 35376)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -249,9 +249,9 @@
</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"> get_current_screen()->set_screen_reader_content( array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'heading_views' => $post_type_object->labels->views,
- 'heading_pagination' => $post_type_object->labels->pagination,
- 'heading_list' => $post_type_object->labels->list,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'heading_views' => $post_type_object->labels->filter_items_list,
+ 'heading_pagination' => $post_type_object->labels->items_list_navigation,
+ 'heading_list' => $post_type_object->labels->items_list,
</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"> add_screen_option( 'per_page', array( 'default' => 20, 'option' => 'edit_' . $post_type . '_per_page' ) );
</span></span></pre></div>
<a id="trunksrcwpincludespostfunctionsphp"></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/post-functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/post-functions.php 2015-10-23 15:42:51 UTC (rev 35375)
+++ trunk/src/wp-includes/post-functions.php 2015-10-23 16:47:57 UTC (rev 35376)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1330,9 +1330,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * - remove_featured_image - Default is Remove featured image.
</span><span class="cx" style="display: block; padding: 0 10px"> * - use_featured_image - Default is Use as featured image.
</span><span class="cx" style="display: block; padding: 0 10px"> * - menu_name - Default is the same as `name`.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * - views - String for the table views hidden heading.
- * - pagination - String for the table pagination hidden heading.
- * - list - String for the table hidden heading.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * - filter_items_list - String for the table views hidden heading.
+ * - items_list_navigation - String for the table pagination hidden heading.
+ * - items_list - String for the table hidden heading.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * Above, the first default value is for non-hierarchical post types (like posts)
</span><span class="cx" style="display: block; padding: 0 10px"> * and the second one is for hierarchical post types (like pages).
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1367,9 +1367,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'set_featured_image' => array( __( 'Set featured image' ), __( 'Set featured image' ) ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'remove_featured_image' => array( __( 'Remove featured image' ), __( 'Remove featured image' ) ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'use_featured_image' => array( __( 'Use as featured image' ), __( 'Use as featured image' ) ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'views' => array( __( 'Filter posts list' ), __( 'Filter pages list' ) ),
- 'pagination' => array( __( 'Posts list navigation' ), __( 'Pages list navigation' ) ),
- 'list' => array( __( 'Posts list' ), __( 'Pages list' ) ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'filter_items_list' => array( __( 'Filter posts list' ), __( 'Filter pages list' ) ),
+ 'items_list_navigation' => array( __( 'Posts list navigation' ), __( 'Pages list navigation' ) ),
+ 'items_list' => array( __( 'Posts list' ), __( 'Pages list' ) ),
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> $nohier_vs_hier_defaults['menu_name'] = $nohier_vs_hier_defaults['name'];
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpincludestaxonomyfunctionsphp"></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/taxonomy-functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/taxonomy-functions.php 2015-10-23 15:42:51 UTC (rev 35375)
+++ trunk/src/wp-includes/taxonomy-functions.php 2015-10-23 16:47:57 UTC (rev 35376)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -494,8 +494,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * - choose_from_most_used - This string isn't used on hierarchical taxonomies. Default is "Choose from the most used tags", used in the meta box.
</span><span class="cx" style="display: block; padding: 0 10px"> * - not_found - Default is "No tags found"/"No categories found", used in the meta box and taxonomy list table.
</span><span class="cx" style="display: block; padding: 0 10px"> * - no_terms - Default is "No tags"/"No categories", used in the posts and media list tables.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * - pagination - String for the table pagination hidden heading.
- * - list - String for the table hidden heading.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * - items_list_navigation - String for the table pagination hidden heading.
+ * - items_list - String for the table hidden heading.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * Above, the first default value is for non-hierarchical taxonomies (like tags) and the second one is for hierarchical taxonomies (like categories).
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -534,8 +534,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'choose_from_most_used' => array( __( 'Choose from the most used tags' ), null ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'not_found' => array( __( 'No tags found.' ), __( 'No categories found.' ) ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'no_terms' => array( __( 'No tags' ), __( 'No categories' ) ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'pagination' => array( __( 'Tags list navigation' ), __( 'Categories list navigation' ) ),
- 'list' => array( __( 'Tags list' ), __( 'Categories list' ) ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'items_list_navigation' => array( __( 'Tags list navigation' ), __( 'Categories list navigation' ) ),
+ 'items_list' => array( __( 'Tags list' ), __( 'Categories list' ) ),
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> $nohier_vs_hier_defaults['menu_name'] = $nohier_vs_hier_defaults['name'];
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre>
</div>
</div>
</body>
</html>