Ticket #30152: 30152.2.patch

src/wp-content/themes/twentyfifteen/inc/template-tags.php

@@ -24 +24 @@
                 return;
         }
 
-        // Set up paginated links.
+        // Set up paginated links. Keep the space before the closing span: screen readers need to have separated words.
         $links = paginate_links( array(
-                'prev_text'          => esc_html__( 'Previous', 'twentyfifteen' ),
-                'next_text'          => esc_html__( 'Next', 'twentyfifteen' ),
-                'before_page_number' => '<span class="meta-nav">' . esc_html__( 'Page', 'twentyfifteen' ) . '</span>',
+                'prev_text'          => esc_html__( 'Previous page', 'twentyfifteen' ),
+                'next_text'          => esc_html__( 'Next page', 'twentyfifteen' ),
+                'before_page_number' => '<span class="meta-nav screen-reader-text">' . esc_html__( 'Page', 'twentyfifteen' ) . ' </span>',
         ) );
 
         if ( $links ) :
+
+        $pagination_heading = is_search() ? esc_html( 'Search results navigation', 'twentyfifteen' ) : esc_html( 'Posts navigation', 'twentyfifteen' );
         ?>
         <nav class="navigation pagination" role="navigation">
-                <h2 class="screen-reader-text"><?php esc_html_e( 'Posts navigation', 'twentyfifteen' ); ?></h2>
+                <h2 class="screen-reader-text"><?php echo $pagination_heading ?></h2>
                 <div class="nav-links">
                         <?php echo $links; ?>
                 </div><!-- .nav-links -->
@@ -77 +79 @@
                         if ( is_attachment() ) :
                                 previous_post_link( '<div class="nav-previous' . $prev_class . '">%link</div>', _x( '<span class="meta-nav">Published In</span><span class="post-title">%title</span>', 'Parent post link', 'twentyfifteen' ) );
                         else :
-                                previous_post_link( '<div class="nav-previous' . $prev_class . '">%link</div>', _x( '<span class="meta-nav">Previous</span><span class="post-title">%title</span>', 'Previous post link', 'twentyfifteen' ) );
-                                next_post_link( '<div class="nav-next' . $next_class . '">%link</div>', _x( '<span class="meta-nav">Next</span><span class="post-title">%title</span>', 'Next post link', 'twentyfifteen' ) );
+                                previous_post_link( '<div class="nav-previous' . $prev_class . '">%link</div>', _x( '<span class="meta-nav">Previous <span class="screen-reader-text">post:</span></span><span class="post-title">%title</span>', 'Previous post link', 'twentyfifteen' ) );
+                                next_post_link( '<div class="nav-next' . $next_class . '">%link</div>', _x( '<span class="meta-nav">Next <span class="screen-reader-text">post:</span></span><span class="post-title">%title</span>', 'Next post link', 'twentyfifteen' ) );
                         endif;
                         ?>
                 </div><!-- .nav-links -->

src/wp-content/themes/twentyfifteen/style.css

@@ -998 +998 @@
         margin-right: 0.3333em;
 }
 
+.current .screen-reader-text {
+        position: static !important;
+}
+
 .pagination .page-numbers {
         display: none;
         line-height: 3.2em;
         padding: 0 0.6667em;
+}
+
+.pagination .page-numbers.current {
         text-transform: uppercase;
 }
 
@@ -2655 +2662 @@
                 padding: 0;
         }
 
+        .current .screen-reader-text {
+                position: absolute !important;
+        }
+
         .pagination .page-numbers {
                 display: inline-block;
         }
 
-        .pagination .meta-nav {
-                display: none;
-        }
-
         .image-navigation {
                 padding: 0 9.0909%;
         }