Changeset 9711

Timestamp:

04/09/2020 06:54:12 AM (5 years ago)

Author:

dd32

Message:

Translate: Restore the Waiting Counts for Plugins/Themes as their own columns.

The column values are updated twice daily on a cron.

Fixes #3155.

Location:

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

Files:

• wporg-gp-customizations/templates/stats-overview.php (modified) (3 diffs)
• wporg-gp-routes/inc/class-plugin.php (modified) (2 diffs)
• wporg-gp-routes/inc/routes/class-stats.php (modified) (3 diffs)

sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-gp-customizations/templates/stats-overview.php

@@ -17 +17 @@
                 <?php foreach ( $projects as $slug => $project ) :
                     $name = str_replace( array( 'WordPress.org ', 'WordPress for ', 'WordPress ', 'ectory', ' - Development' ), '', $project->name );
+                    if ( $slug == 'wp-plugins' || $slug == 'wp-themes' ) {
+                        $name = "Waiting $name";
+                    }
                     ?>
                     <th class="col-<?php echo esc_attr( sanitize_title( $name ) ); ?>"><?php echo esc_html( $name ); ?></th>
@@ -47 +50 @@
                             $percent = $translation_locale_statuses[ $locale_slug ][ $project->path ];
 
-                            if ( 'waiting' === $project->path ) {
+                            if ( 'waiting' === $project->path || 'wp-plugins' === $project->path || 'wp-themes' === $project->path ) {
+                                $project_link_title = '';
+                                if ( 'wp-plugins' === $project->path || 'wp-themes' === $project->path ) {
+                                    $project_link_title = "Last Updated {$project->cache_last_updated}";
+
+                                    // Filter Plugins/Themes to Waiting (Most first) - Relying upon these being the last items.
+                                    $projecturl = add_query_arg( 'filter', 'strings-waiting-and-fuzzy', $projecturl );
+                                }
+
                                 // Color code it on -0~500 waiting strings
                                 $percent_class = 100-min( (int) ( $percent / 50 ) * 10, 100 );
@@ -55 +66 @@
                                 }
                                 $percent_class = 'percent' . $percent_class;
-                                echo '<td data-column-title="' . esc_attr( $project_name ) . '" data-sort-value="'. esc_attr( $percent ) . '" class="' . $percent_class .'"><a href="' . esc_url( $projecturl ) . '">' . number_format( $percent ) . '</a></td>';
+                                echo '<td data-column-title="' . esc_attr( $project_name ) . '" data-sort-value="'. esc_attr( $percent ) . '" class="' . $percent_class .'"><a href="' . esc_url( $projecturl ) . '" title="' . esc_attr( $project_link_title ) . '">' . number_format( $percent ) . '</a></td>';
                             } else {
                                 $percent_class = 'percent' . (int) ( $percent / 10 ) * 10;

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

@@ -47 +47 @@
 
         add_action( 'init', [ $this, 'respect_robots_txt' ], 9 );
+
+        add_action( 'init', [ $this, 'cron_tasks' ] );
     }
 
@@ -58 +60 @@
         // ?gp_route=robots.txt is here, as GlotPress ultimately is the router for the request.
         add_rewrite_rule( '^robots\.txt$', 'index.php?robots=1&gp_route=robots.txt', 'top' );
+    }
+
+    /**
+     * Some pages rely upon a regular cron task to update the stats rather than live updates.
+     */
+    function cron_tasks() {
+        if ( ! wp_next_scheduled ( 'wporg_gp_stats_cache_waiting_strings' ) ) {
+            wp_schedule_event( time(), 'twicedaily', 'wporg_gp_stats_cache_waiting_strings' );
+        }
+        add_action( 'wporg_gp_stats_cache_waiting_strings', [ __NAMESPACE__ . '\Routes\Stats', 'cache_waiting_strings' ] );
     }
 

sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-gp-routes/inc/routes/class-stats.php

@@ -13 +13 @@
  */
 class Stats extends GP_Route {
+
+    /**
+     * Cache some expensive queries to be run on a Cron task.
+     */
+    public function cache_waiting_strings() {
+        global $wpdb;
+
+        $cached_projects = [
+            GP::$project->by_path( 'wp-plugins' ),
+            GP::$project->by_path( 'wp-themes' ),
+        ];
+        $sql = "SELECT
+                locale, locale_slug,
+                SUM( stats.waiting ) + SUM( stats.fuzzy ) as waiting_strings
+            FROM {$wpdb->project_translation_status} stats
+                LEFT JOIN {$wpdb->gp_projects} p ON stats.project_id = p.id
+            WHERE
+                p.parent_project_id = %d
+                AND p.active = 1
+            GROUP BY locale, locale_slug";
+
+        foreach ( $cached_projects as $project ) {
+            $rows = $wpdb->get_results( $wpdb->prepare( $sql, $project->id ) );
+
+            $cached_data = [];
+            foreach ( $rows as $set ) {
+                $locale_key = $set->locale;
+                if ( 'default' != $set->locale_slug ) {
+                    $locale_key = $set->locale . '/' . $set->locale_slug;
+                }
+    
+                $cached_data[ $locale_key ] = (int) $set->waiting_strings;
+            }
+            $cached_data[ 'last_updated' ] = time();
+
+            update_option( __CLASS__ . '_cached_waiting_' . $project->slug, $cached_data, false );
+        }
+
+    }
 
     public function get_stats_overview() {
@@ -27 +66 @@
             'apps/ios' => false,
             'waiting' => false,
+            'wp-themes' => false,
+            'wp-plugins' => false,
         );
 
@@ -84 +125 @@
 
         // Append the Plugins/Themes waiting strings
-        /*$parent_project_ids = implode(',', array(
-            GP::$project->by_path( 'wp-plugins' )->id,
-            GP::$project->by_path( 'wp-themes' )->id,
-        ) );
-        $sql = "SELECT
-                locale, locale_slug,
-                SUM( stats.waiting ) + SUM( stats.fuzzy ) as waiting_strings
-            FROM {$wpdb->project_translation_status} stats
-                LEFT JOIN {$wpdb->gp_projects} p ON stats.project_id = p.id
-            WHERE
-                p.parent_project_id IN ( $parent_project_ids )
-                AND p.active = 1
-            GROUP BY locale, locale_slug";
-
-        $rows = $wpdb->get_results( $sql );
-        foreach ( $rows as $set ) {
-            $locale_key = $set->locale;
-            if ( 'default' != $set->locale_slug ) {
-                $locale_key = $set->locale . '/' . $set->locale_slug;
-            }
-
-            $translation_locale_statuses[ $locale_key ]['waiting'] += (int) $set->waiting_strings;
-        }*/
+        foreach ( [ 'wp-plugins', 'wp-themes' ] as $project_slug ) {
+            $cached_data = get_option( __CLASS__ . '_cached_waiting_' . $project_slug, [] );
+            $projects[ $project_slug ]->cache_last_updated = gmdate( 'Y-m-d H:i:s \U\T\C', $cached_data['last_updated'] );
+            foreach ( $cached_data as $locale => $waiting ) {
+                $translation_locale_statuses[ $locale ][ $project_slug ] = $waiting;
+            }
+        }
 
         // Calculate a list of [Locale] = % subtotals