<!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>[49866] trunk/src/wp-content/themes/twentytwentyone: Twenty Twenty-One: Improve strings found in post navigations for easier translating.</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 { white-space: pre-line; 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/49866">49866</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/49866","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>desrosj</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2020-12-22 16:13:51 +0000 (Tue, 22 Dec 2020)</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'>Twenty Twenty-One: Improve strings found in post navigations for easier translating.

This change adjusts strings found within post navigations to ensure translators are provided the full context needed to properly translate.

Props poena, SergeyBiryukov, aristath.
Fixes <a href="https://core.trac.wordpress.org/ticket/52047">#52047</a>.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpcontentthemestwentytwentyonecommentsphp">trunk/src/wp-content/themes/twentytwentyone/comments.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentytwentyoneinctemplatetagsphp">trunk/src/wp-content/themes/twentytwentyone/inc/template-tags.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentytwentyonesinglephp">trunk/src/wp-content/themes/twentytwentyone/single.php</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpcontentthemestwentytwentyonecommentsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentytwentyone/comments.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentytwentyone/comments.php  2020-12-22 15:42:14 UTC (rev 49865)
+++ trunk/src/wp-content/themes/twentytwentyone/comments.php    2020-12-22 16:13:51 UTC (rev 49866)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -59,8 +59,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                <?php
</span><span class="cx" style="display: block; padding: 0 10px">                the_comments_pagination(
</span><span class="cx" style="display: block; padding: 0 10px">                        array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                /* translators: There is a space after page. */
-                               'before_page_number' => esc_html__( 'Page ', 'twentytwentyone' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         'before_page_number' => esc_html__( 'Page', 'twentytwentyone' ) . ' ',
</ins><span class="cx" style="display: block; padding: 0 10px">                                 'mid_size'           => 0,
</span><span class="cx" style="display: block; padding: 0 10px">                                'prev_text'          => sprintf(
</span><span class="cx" style="display: block; padding: 0 10px">                                        '%s <span class="nav-prev-text">%s</span>',
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentytwentyoneinctemplatetagsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentytwentyone/inc/template-tags.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentytwentyone/inc/template-tags.php 2020-12-22 15:42:14 UTC (rev 49865)
+++ trunk/src/wp-content/themes/twentytwentyone/inc/template-tags.php   2020-12-22 16:13:51 UTC (rev 49866)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -223,37 +223,31 @@
</span><span class="cx" style="display: block; padding: 0 10px">         * @return void
</span><span class="cx" style="display: block; padding: 0 10px">         */
</span><span class="cx" style="display: block; padding: 0 10px">        function twenty_twenty_one_the_posts_navigation() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $post_type      = get_post_type_object( get_post_type() );
-               $post_type_name = '';
-               if (
-                       is_object( $post_type ) &&
-                       property_exists( $post_type, 'labels' ) &&
-                       is_object( $post_type->labels ) &&
-                       property_exists( $post_type->labels, 'name' )
-               ) {
-                       $post_type_name = $post_type->labels->name;
-               }
-
</del><span class="cx" style="display: block; padding: 0 10px">                 the_posts_pagination(
</span><span class="cx" style="display: block; padding: 0 10px">                        array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                /* translators: There is a space after page. */
-                               'before_page_number' => esc_html__( 'Page ', 'twentytwentyone' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         'before_page_number' => esc_html__( 'Page', 'twentytwentyone' ) . ' ',
</ins><span class="cx" style="display: block; padding: 0 10px">                                 'mid_size'           => 0,
</span><span class="cx" style="display: block; padding: 0 10px">                                'prev_text'          => sprintf(
</span><span class="cx" style="display: block; padding: 0 10px">                                        '%s <span class="nav-prev-text">%s</span>',
</span><span class="cx" style="display: block; padding: 0 10px">                                        is_rtl() ? twenty_twenty_one_get_icon_svg( 'ui', 'arrow_right' ) : twenty_twenty_one_get_icon_svg( 'ui', 'arrow_left' ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        sprintf(
-                                               /* translators: %s: The post-type name. */
-                                               esc_html__( 'Newer %s', 'twentytwentyone' ),
-                                               '<span class="nav-short">' . esc_html( $post_type_name ) . '</span>'
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 wp_kses(
+                                               __( 'Newer <span class="nav-short">posts</span>', 'twentytwentyone' ),
+                                               array(
+                                                       'span' => array(
+                                                               'class' => array(),
+                                                       ),
+                                               )
</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">                                'next_text'          => sprintf(
</span><span class="cx" style="display: block; padding: 0 10px">                                        '<span class="nav-next-text">%s</span> %s',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        sprintf(
-                                               /* translators: %s: The post-type name. */
-                                               esc_html__( 'Older %s', 'twentytwentyone' ),
-                                               '<span class="nav-short">' . esc_html( $post_type_name ) . '</span>'
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 wp_kses(
+                                               __( 'Older <span class="nav-short">posts</span>', 'twentytwentyone' ),
+                                               array(
+                                                       'span' => array(
+                                                               'class' => array(),
+                                                       ),
+                                               )
</ins><span class="cx" style="display: block; padding: 0 10px">                                         ),
</span><span class="cx" style="display: block; padding: 0 10px">                                        is_rtl() ? twenty_twenty_one_get_icon_svg( 'ui', 'arrow_left' ) : twenty_twenty_one_get_icon_svg( 'ui', 'arrow_right' )
</span><span class="cx" style="display: block; padding: 0 10px">                                ),
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentytwentyonesinglephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentytwentyone/single.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentytwentyone/single.php    2020-12-22 15:42:14 UTC (rev 49865)
+++ trunk/src/wp-content/themes/twentytwentyone/single.php      2020-12-22 16:13:51 UTC (rev 49866)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -36,22 +36,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">        $twentytwentyone_next = is_rtl() ? twenty_twenty_one_get_icon_svg( 'ui', 'arrow_left' ) : twenty_twenty_one_get_icon_svg( 'ui', 'arrow_right' );
</span><span class="cx" style="display: block; padding: 0 10px">        $twentytwentyone_prev = is_rtl() ? twenty_twenty_one_get_icon_svg( 'ui', 'arrow_right' ) : twenty_twenty_one_get_icon_svg( 'ui', 'arrow_left' );
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        $twentytwentyone_post_type      = get_post_type_object( get_post_type() );
-       $twentytwentyone_post_type_name = '';
-       if (
-               is_object( $twentytwentyone_post_type ) &&
-               property_exists( $twentytwentyone_post_type, 'labels' ) &&
-               is_object( $twentytwentyone_post_type->labels ) &&
-               property_exists( $twentytwentyone_post_type->labels, 'singular_name' )
-       ) {
-               $twentytwentyone_post_type_name = $twentytwentyone_post_type->labels->singular_name;
-       }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $twentytwentyone_next_label     = esc_html__( 'Next post', 'twentytwentyone' );
+       $twentytwentyone_previous_label = esc_html__( 'Previous post', 'twentytwentyone' );
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        /* translators: %s: The post-type singular name (example: Post, Page, etc.) */
-       $twentytwentyone_next_label = sprintf( esc_html__( 'Next %s', 'twentytwentyone' ), $twentytwentyone_post_type_name );
-       /* translators: %s: The post-type singular name (example: Post, Page, etc.) */
-       $twentytwentyone_previous_label = sprintf( esc_html__( 'Previous %s', 'twentytwentyone' ), $twentytwentyone_post_type_name );
-
</del><span class="cx" style="display: block; padding: 0 10px">         the_post_navigation(
</span><span class="cx" style="display: block; padding: 0 10px">                array(
</span><span class="cx" style="display: block; padding: 0 10px">                        'next_text' => '<p class="meta-nav">' . $twentytwentyone_next_label . $twentytwentyone_next . '</p><p class="post-title">%title</p>',
</span></span></pre>
</div>
</div>

</body>
</html>