Changeset 4764

Timestamp:

01/24/2017 10:59:27 AM (8 years ago)

Author:

dd32

Message:

Plugin Directory: Use translated data for the api.wordpress.org info endpoint.

• Also translates screenshot titles on the front end
• Also uses plugin tags in API info endpoint rather than defunct categories.

See #2112
Fixes #2415

Location:

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

Files:

• api/routes/class-plugin.php (modified) (5 diffs)
• class-i18n.php (modified) (1 diff)
• class-plugin-directory.php (modified) (1 diff)
• class-plugin-i18n.php (modified) (1 diff)
• shortcodes/class-screenshots.php (modified) (2 diffs)

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

@@ -2 +2 @@
 namespace WordPressdotorg\Plugin_Directory\API\Routes;
 use WordPressdotorg\Plugin_Directory\Plugin_Directory;
+use WordPressdotorg\Plugin_Directory\Plugin_i18n;
 use WordPressdotorg\Plugin_Directory\Template;
 use WordPressdotorg\Plugin_Directory\Tools;
@@ -55 +56 @@
         }
 
+        // Support returning API data in different locales, even on wordpress.org (for api.wordpress.org usage)
+        if ( ! empty( $request['locale'] ) && !in_array( strtolower( $request['locale'] ), array( 'en_us', 'en' ) ) ) {
+            switch_to_locale( $request['locale'] );
+        }
+
         $post_id = $post->ID;
 
         $result = array();
-        $result['name'] = $post->post_title;
+        $result['name'] = get_the_title();
         $result['slug'] = $post->post_name;
         $result['version'] = get_post_meta( $post_id, 'version', true ) ?: '0.0';
@@ -116 +122 @@
         if ( !empty( $result['sections']['faq'] ) ) {
             $result['sections']['faq'] = $this->get_simplified_faq_markup( $result['sections']['faq'] );
-        } 
+        }
         
         $result['description'] = $result['sections']['description'];
 
-        $result['short_description'] = $post->post_excerpt;
+        $result['short_description'] = get_the_excerpt();
         $result['download_link'] = Template::download_link( $post );
 
@@ -132 +138 @@
          */
         foreach ( $screen_shots as $image ) {
-            $result['screenshots'][ $image['resolution'] ] = array(
-                'src'     => Template::get_asset_url( $post, $image ),
-                'caption' => array_key_exists( $image['resolution'], $descriptions ) ? $descriptions[ $image['resolution'] ] : ''
-            );
+            $src = Template::get_asset_url( $post, $image );
+            $caption = '';
+            if ( $descriptions && !empty( $description[ (int)$image['resolution'] ] ) ) {
+                $caption = $description[ (int)$image['resolution'] ];
+                $caption = Plugin_I18n::instance()->translate( 'screenshot-' . $image['resolution'], $caption, [ 'post_id' => $$post->ID ] );
+            }
+
+            $result['screenshots'][ $image['resolution'] ] = compact( 'src', 'caption' );
         }
 
@@ -145 +155 @@
 
         $result['tags'] = array();
-        if ( $terms = get_the_terms( $post->ID, 'plugin_category' ) ) {
+        if ( $terms = get_the_terms( $post->ID, 'plugin_tags' ) ) {
             foreach ( $terms as $term ) {
                 $result['tags'][ $term->slug ] = $term->name;

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

@@ -16 +16 @@
      */
     static function translate_term( $term ) {
+        if ( 'en_US' == get_locale() ) {
+            return $term;
+        }
+
         if ( 'plugin_category' == $term->taxonomy ) {
             $term->name = esc_html( translate_with_gettext_context( html_entity_decode( $term->name ), 'Plugin Category Name', 'wporg-plugins' ) );

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

@@ -454 +454 @@
         }
 
-        if ( 'en_US' != get_locale() ) {
-            add_filter( 'get_term', array( __NAMESPACE__ . '\I18n', 'translate_term' ) );
-            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, 2 );
-        }
+        add_filter( 'get_term', array( __NAMESPACE__ . '\I18n', 'translate_term' ) );
+        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, 2 );
 
         // Instantiate our copy of the Jetpack_Search class.

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

@@ -332 +332 @@
         }
 
-        if ( ! $wp_locale ) {
+        if ( ! $wp_locale || 'en_US' == $wp_locale ) {
             return $content;
         }

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

@@ -2 +2 @@
 namespace WordPressdotorg\Plugin_Directory\Shortcodes;
 use WordPressdotorg\Plugin_Directory\Template;
+use WordPressdotorg\Plugin_Directory\Plugin_i18n;
 
 /**
@@ -35 +36 @@
 
             if ( $descriptions && ! empty( $descriptions[ (int)$image['resolution'] ] ) ) {
-                $screen_shot .= '<figcaption>' . $descriptions[ (int)$image['resolution'] ] . '</figcaption>';
+                $caption = $descriptions[ (int)$image['resolution'] ];
+                $caption = Plugin_I18n::instance()->translate( 'screenshot-' . $image['resolution'], $caption, [ 'post_id' => $$plugin->ID ] );
+                $screen_shot .= '<figcaption>' . $caption . '</figcaption>';
             }