Changeset 3468

Timestamp:

06/19/2016 12:15:28 PM (10 years ago)

Author:

ocean90

Message:

Plugin Directory: Pass the post object to Plugin_I18n::translate().

Fixes missing translations for excerpts on the front page.

See #1691.

Location:

sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory

Files:

• class-plugin-directory.php (modified) (3 diffs)
• class-plugin-i18n.php (modified) (1 diff)

sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/class-plugin-directory.php

@@ -235 +235 @@
                         add_filter( 'the_content', array( $this, 'translate_post_content' ), 1, 2 );
                         add_filter( 'the_title', array( $this, 'translate_post_title' ), 1, 2 );
-                        add_filter( 'get_the_excerpt', array( $this, 'translate_post_excerpt' ), 1 );
+                        add_filter( 'get_the_excerpt', array( $this, 'translate_post_excerpt' ), 1, 2 );
                 }
 
@@ -508 +508 @@
          * @return string
          */
-        public function translate_post_title( $title, $post_id ) {
+        public function translate_post_title( $title, $post_id = null ) {
                 $post = get_post();
 
                 if ( $post instanceof \WP_Post && $post_id === $post->ID ) {
-                        $title = Plugin_I18n::instance()->translate( 'title', $title );
+                        $title = Plugin_I18n::instance()->translate( 'title', $title, [ 'post_id' => $post ] );
                 }
 
@@ -522 +522 @@
          *
          * @param string $excerpt
+         * @param \WP_Post $post
          * @return string
          */
-        public function translate_post_excerpt( $excerpt ) {
-                return Plugin_I18n::instance()->translate( 'excerpt', $excerpt );
+        public function translate_post_excerpt( $excerpt, $post ) {
+                return Plugin_I18n::instance()->translate( 'excerpt', $excerpt, [ 'post_id' => $post ] );
         }
 

sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/class-plugin-i18n.php

@@ -268 +268 @@
                 }
 
-                if ( !empty( $args['post_id'] ) && is_numeric( $args['post_id'] ) ) {
-                        $topic = get_post( $args['post_id'] );
-                } else {
-                        global $post;
-                }
-
-                if ( empty( $post ) ) {
-                        return $content;
-                }
-
-                if ( !empty( $args['locale'] ) ) {
+                $args = wp_parse_args( $args, [
+                        'post_id' => null,
+                        'locale'  => '',
+                ] );
+
+                $post = get_post( $args['post_id'] );
+
+                if ( ! $post ) {
+                        return $content;
+                }
+
+                if ( ! empty( $args['locale'] ) ) {
                         $wp_locale = $args['locale'];
                 } else {