Ticket #52047: 52047.2.diff

src/wp-content/themes/twentytwentyone/comments.php

@@ -59 +59 @@
                 <?php
                 the_comments_pagination(
                         array(
-                                /* translators: There is a space after page. */
-                                'before_page_number' => esc_html__( 'Page ', 'twentytwentyone' ),
+                                'before_page_number' => esc_html__( 'Page', 'twentytwentyone' ) . ' ',
                                 'mid_size'           => 0,
                                 'prev_text'          => sprintf(
                                         '%s <span class="nav-prev-text">%s</span>',

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

@@ -223 +223 @@
          * @return void
          */
         function twenty_twenty_one_the_posts_navigation() {
-                $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;
-                }
-
                 the_posts_pagination(
                         array(
-                                /* translators: There is a space after page. */
-                                'before_page_number' => esc_html__( 'Page ', 'twentytwentyone' ),
+                                'before_page_number' => esc_html__( 'Page', 'twentytwentyone' ) . ' ',
                                 'mid_size'           => 0,
                                 'prev_text'          => sprintf(
                                         '%s <span class="nav-prev-text">%s</span>',
                                         is_rtl() ? twenty_twenty_one_get_icon_svg( 'ui', 'arrow_right' ) : twenty_twenty_one_get_icon_svg( 'ui', 'arrow_left' ),
-                                        sprintf(
-                                                /* translators: %s: The post-type name. */
-                                                esc_html__( 'Newer %s', 'twentytwentyone' ),
-                                                '<span class="nav-short">' . esc_html( $post_type_name ) . '</span>'
-                                        )
+                                        __( 'Newer <span class="nav-short">posts</span>', 'twentytwentyone' )
                                 ),
                                 'next_text'          => sprintf(
                                         '<span class="nav-next-text">%s</span> %s',
-                                        sprintf(
-                                                /* translators: %s: The post-type name. */
-                                                esc_html__( 'Older %s', 'twentytwentyone' ),
-                                                '<span class="nav-short">' . esc_html( $post_type_name ) . '</span>'
-                                        ),
+                                        __( 'Older <span class="nav-short">posts</span>', 'twentytwentyone' ),
                                         is_rtl() ? twenty_twenty_one_get_icon_svg( 'ui', 'arrow_left' ) : twenty_twenty_one_get_icon_svg( 'ui', 'arrow_right' )
                                 ),
                         )

src/wp-content/themes/twentytwentyone/single.php

@@ -36 +36 @@
         $twentytwentyone_next = is_rtl() ? twenty_twenty_one_get_icon_svg( 'ui', 'arrow_left' ) : twenty_twenty_one_get_icon_svg( 'ui', 'arrow_right' );
         $twentytwentyone_prev = is_rtl() ? twenty_twenty_one_get_icon_svg( 'ui', 'arrow_right' ) : twenty_twenty_one_get_icon_svg( 'ui', 'arrow_left' );
 
-        $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;
-        }
+        $twentytwentyone_next_label     = esc_html__( 'Next post', 'twentytwentyone' );
+        $twentytwentyone_previous_label = esc_html__( 'Previous post', 'twentytwentyone' );
 
-        /* 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 );
-
         the_post_navigation(
                 array(
                         'next_text' => '<p class="meta-nav">' . $twentytwentyone_next_label . $twentytwentyone_next . '</p><p class="post-title">%title</p>',