Changeset 8937

Timestamp:

06/10/2019 02:45:10 PM (5 years ago)

Author:

ocean90

Message:

Translate: Send approved translations to translation memory.

Props yoavf, ocean90.
See #4430.

Location:

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

Files:

• wporg-gp-customizations/templates/translation-row-editor.php (modified) (1 diff)
• wporg-gp-plugin-directory/inc/cli/class-sync-plugin-translations.php (modified) (1 diff)
• wporg-gp-translation-suggestions/inc/class-plugin.php (modified) (3 diffs)
• wporg-gp-translation-suggestions/inc/class-translation-memory-client.php (modified) (5 diffs)
• wporg-gp-translation-suggestions/js/translation-suggestions.js (modified) (1 diff)

sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-gp-customizations/templates/translation-row-editor.php

@@ -76 +76 @@
                         <div class="button-menu">
                             <button type="button" class="button-menu__toggle with-tooltip" aria-label="Show contextual links">
-                                <span class="screen-reader-text">Links</span><span aria-hidden="true" class="dashicons dashicons-paperclip"></span>
+                                <span class="screen-reader-text">Links</span><span aria-hidden="true" class="dashicons dashicons-menu-alt"></span>
                             </button>
                             <ul class="button-menu__dropdown">

sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-gp-plugin-directory/inc/cli/class-sync-plugin-translations.php

@@ -14 +14 @@
 
     /**
-     * Delete a plugin project and its translations.
+     * Sync plugin translations.
      *
      * ## OPTIONS

sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-gp-translation-suggestions/inc/class-plugin.php

@@ -5 +5 @@
 use GP;
 use GP_Locales;
-use Text_Diff;
-use WP_Error;
-use WP_Http;
-use WP_Text_Diff_Renderer_inline;
-
-require_once ABSPATH . '/wp-includes/wp-diff.php' ;
 
 class Plugin {
+
+    const TM_UPDATE_EVENT = 'wporg_translate_tm_update';
 
     /**
@@ -18 +14 @@
      */
     private static $instance;
+
+    /**
+     * @var array
+     */
+    private $queue = [];
 
     /**
@@ -45 +46 @@
         add_action( 'gp_pre_tmpl_load', [ $this, 'pre_tmpl_load' ], 10, 2 );
         add_action( 'wporg_translate_suggestions', [ $this, 'extend_translation_suggestions' ] );
+
+        if ( 'cli' !== PHP_SAPI ) {
+            add_action( 'gp_translation_created', [ $this, 'translation_updated' ], 3 );
+            add_action( 'gp_translation_saved', [ $this, 'translation_updated' ], 3 );
+
+            // DB Writes are delayed until shutdown to bulk-update the stats during imports.
+            add_action( 'shutdown', [ $this, 'schedule_tm_update' ], 3 );
+        }
+
+        add_action( self::TM_UPDATE_EVENT, [ Translation_Memory_Client::class, 'update' ] );
+    }
+
+    /**
+     * Adds a translation in queue when a translation was created
+     * or updated.
+     *
+     * @param \GP_Translation $translation Created/updated translation.
+     */
+    public function translation_updated( $translation ) {
+        if ( ! $translation->user_id || 'current' !== $translation->status ) {
+            return;
+        }
+
+        $this->queue[ $translation->original_id ] = $translation->id;
+    }
+
+    /**
+     * Schedules a single event to update translation memory for new translations.
+     */
+    public function schedule_tm_update() {
+        remove_action( 'gp_translation_created', [ $this, 'translation_updated' ], 3 );
+        remove_action( 'gp_translation_saved', [ $this, 'translation_updated' ], 3 );
+
+        if ( ! $this->queue ) {
+            return;
+        }
+
+        wp_schedule_single_event( time() + 60, self::TM_UPDATE_EVENT, [ 'translations' => $this->queue ] );
     }
 

sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-gp-translation-suggestions/inc/class-translation-memory-client.php

@@ -3 +3 @@
 namespace WordPressdotorg\GlotPress\TranslationSuggestions;
 
+use GP;
 use Text_Diff;
 use WP_Error;
@@ -8 +9 @@
 use WP_Text_Diff_Renderer_inline;
 
-require_once ABSPATH . '/wp-includes/wp-diff.php' ;
+require_once ABSPATH . '/wp-includes/wp-diff.php';
 
 class Translation_Memory_Client {
 
     const API_ENDPOINT = 'https://translate.wordpress.com/api/tm/';
+    const API_BULK_ENDPOINT = 'https://translate.wordpress.com/api/tm/-bulk';
+
+    /**
+     * Updates translation memory with new strings.
+     *
+     * @param array $translations  List of translation IDs, keyed by original ID.
+     * @return true|\WP_Error True on success, WP_Error on failure.
+     */
+    public static function update( array $translations ) {
+        $requests = [];
+
+        foreach ( $translations as $original_id => $translation_id ) {
+            $translation = GP::$translation->get( $translation_id );
+
+            // Check again in case the translation was changed.
+            if ( 'current' !== $translation->status ) {
+                continue;
+            }
+
+            $original        = GP::$original->get( $original_id );
+            $translation_set = GP::$translation_set->get( $translation->translation_set_id );
+
+            $locale = $translation_set->locale;
+            if ( 'default' !== $translation_set->slug ) {
+                $locale .= '_' . $translation_set->slug;
+            }
+
+            $requests[] = [
+                'source'       => $original->fields(),
+                'translations' => [
+                    [
+                        'singular' => $translation->translation_0,
+                        'plural'   => $translation->translation_1,
+                        'locale'   => $locale,
+                    ],
+                ],
+            ];
+        }
+
+        if ( ! $requests ) {
+            return new WP_Error( 'no_translations' );
+        }
+
+        $body = wp_json_encode( [
+            'token'    => WPCOM_TM_TOKEN,
+            'requests' => $requests,
+        ] );
+
+        $request = wp_remote_post(
+            self::API_BULK_ENDPOINT,
+            [
+                'timeout'    => 10,
+                'user-agent' => 'WordPress.org Translate',
+                'body'       => $body,
+            ]
+        );
+
+        if ( is_wp_error( $request ) ) {
+            return $request;
+        }
+
+        if ( WP_Http::OK !== wp_remote_retrieve_response_code( $request ) ) {
+            return new WP_Error( 'response_code_not_ok' );
+        }
+
+        $body   = wp_remote_retrieve_body( $request );
+        $result = json_decode( $body, true );
+
+        if ( JSON_ERROR_NONE !== json_last_error() ) {
+            return new WP_Error( 'json_parse_error' );
+        }
+
+        return $result ?: new WP_Error( 'unknown_error' );
+    }
 
     /**
@@ -22 +97 @@
      */
     public static function query( string $text, string $target_locale ) {
-        if ( ! defined ( 'WPCOM_TM_TOKEN' ) ) {
+        if ( ! defined( 'WPCOM_TM_TOKEN' ) ) {
             return new WP_Error( 'no_token' );
         }
@@ -30 +105 @@
             'target' => $target_locale,
             'token'  => WPCOM_TM_TOKEN,
-        ] ) , self::API_ENDPOINT );
+            'ts'     => time(),
+        ] ), self::API_ENDPOINT );
+
 
         $request = wp_remote_get(
             $url,
             [
-                'timeout'     => 2,
-                'user-agent'  => 'WordPress.org Translate',
+                'timeout'    => 2,
+                'user-agent' => 'WordPress.org Translate',
             ]
         );
@@ -82 +159 @@
         $diff     = new  Text_Diff( 'auto', [ [ $previous_text ], [ $text ] ] );
         $renderer = new WP_Text_Diff_Renderer_inline();
+
         return $renderer->render( $diff );
     }

sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-gp-translation-suggestions/js/translation-suggestions.js

@@ -7 +7 @@
                 'nonce': nonce
             },
-            dataType: 'json'
+            dataType: 'json',
+            cache: false,
         } );