Changeset 49574 for trunk/src/wp-content/themes/twentytwentyone/single.php

Timestamp:

11/12/2020 06:34:44 PM (5 years ago)

Author:

desrosj

Message:

Twenty Twenty-One: Merge the latest changes changes from GitHub for Beta 4.

In addition to syncing the latest changes, this change also merges the theme’s .scss files and other related build tool configurations required to compile the theme’s CSS.

This will allow development of the theme to continue on Trac after 5.6 is released and the GitHub repository is archived.

For a full list of changes since [], see ​https://github.com/WordPress/twentytwentyone/compare/e7d5991...aa284fd.

Props poena, luminuu kjellr, aristath, justinahinon.
See #51526.

File:

• trunk/src/wp-content/themes/twentytwentyone/single.php (modified) (2 diffs)

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

@@ -18 +18 @@
     get_template_part( 'template-parts/content/content-single' );
 
-    if ( is_singular( 'attachment' ) ) {
+    if ( is_attachment() ) {
         // Parent post navigation.
         the_post_navigation(
@@ -33 +33 @@
     }
 
-    if ( is_singular( 'post' ) ) {
-        // Previous/next post navigation.
-        $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' );
-        the_post_navigation(
-            array(
-                'next_text' => '<p class="meta-nav">' . esc_html__( 'Next Post', 'twentytwentyone' ) . $twentytwentyone_next . '</p><p class="post-title">%title</p>',
-                'prev_text' => '<p class="meta-nav">' . $twentytwentyone_prev . esc_html__( 'Previous Post', 'twentytwentyone' ) . '</p><p class="post-title">%title</p>',
-            )
-        );
+    // Previous/next post navigation.
+    $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;
     }
 
+    /* translators: %s: The post-type singlular name (example: Post, Page etc) */
+    $twentytwentyone_next_label = sprintf( esc_html__( 'Next %s', 'twentytwentyone' ), $twentytwentyone_post_type_name );
+    /* translators: %s: The post-type singlular 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>',
+            'prev_text' => '<p class="meta-nav">' . $twentytwentyone_prev . $twentytwentyone_previous_label . '</p><p class="post-title">%title</p>',
+        )
+    );
 endwhile; // End of the loop.