Changeset 49869 for branches/5.6

Timestamp:

12/22/2020 04:19:26 PM (4 years ago)

Author:

desrosj

Message:

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.
Merges [49866] to the 5.6 branch.
Fixes #52047.

Location:

branches/5.6

Files:

• . (modified) (1 prop)
• src/wp-content/themes/twentytwentyone/comments.php (modified) (1 diff)
• src/wp-content/themes/twentytwentyone/inc/template-tags.php (modified) (1 diff)
• src/wp-content/themes/twentytwentyone/single.php (modified) (1 diff)

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

@@ -60 +60 @@
         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(

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

@@ -224 +224 @@
      */
     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>'
+                    wp_kses(
+                        __( 'Newer <span class="nav-short">posts</span>', 'twentytwentyone' ),
+                        array(
+                            'span' => array(
+                                'class' => array(),
+                            ),
+                        )
                     )
                 ),
                 '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>'
+                    wp_kses(
+                        __( 'Older <span class="nav-short">posts</span>', 'twentytwentyone' ),
+                        array(
+                            'span' => array(
+                                'class' => array(),
+                            ),
+                        )
                     ),
                     is_rtl() ? twenty_twenty_one_get_icon_svg( 'ui', 'arrow_left' ) : twenty_twenty_one_get_icon_svg( 'ui', 'arrow_right' )

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

@@ -37 +37 @@
     $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;
-    }
-
-    /* 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 );
+    $twentytwentyone_next_label     = esc_html__( 'Next post', 'twentytwentyone' );
+    $twentytwentyone_previous_label = esc_html__( 'Previous post', 'twentytwentyone' );
 
     the_post_navigation(