<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[9711] sites/trunk/wordpress.org/public_html/wp-content/plugins: Translate: Restore the Waiting Counts for Plugins/Themes as their own columns.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { white-space: pre-line; overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="http://meta.trac.wordpress.org/changeset/9711">9711</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"http://meta.trac.wordpress.org/changeset/9711","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>dd32</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2020-04-09 06:54:12 +0000 (Thu, 09 Apr 2020)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Translate: Restore the Waiting Counts for Plugins/Themes as their own columns.
The column values are updated twice daily on a cron.
Fixes <a href="http://meta.trac.wordpress.org/ticket/3155">#3155</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginswporggpcustomizationstemplatesstatsoverviewphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-gp-customizations/templates/stats-overview.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginswporggproutesincclasspluginphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-gp-routes/inc/class-plugin.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginswporggproutesincroutesclassstatsphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-gp-routes/inc/routes/class-stats.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginswporggpcustomizationstemplatesstatsoverviewphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-gp-customizations/templates/stats-overview.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-gp-customizations/templates/stats-overview.php 2020-04-08 06:32:20 UTC (rev 9710)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-gp-customizations/templates/stats-overview.php 2020-04-09 06:54:12 UTC (rev 9711)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -16,6 +16,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <th class="col-locale-code"><?php _e( 'Locale' ); ?></th>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php foreach ( $projects as $slug => $project ) :
</span><span class="cx" style="display: block; padding: 0 10px"> $name = str_replace( array( 'WordPress.org ', 'WordPress for ', 'WordPress ', 'ectory', ' - Development' ), '', $project->name );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $slug == 'wp-plugins' || $slug == 'wp-themes' ) {
+ $name = "Waiting $name";
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <th class="col-<?php echo esc_attr( sanitize_title( $name ) ); ?>"><?php echo esc_html( $name ); ?></th>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endforeach; ?>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -46,7 +49,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $translation_locale_statuses[ $locale_slug ][ $project->path ] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $percent = $translation_locale_statuses[ $locale_slug ][ $project->path ];
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'waiting' === $project->path ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 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 );
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Color code it on -0~500 waiting strings
</span><span class="cx" style="display: block; padding: 0 10px"> $percent_class = 100-min( (int) ( $percent / 50 ) * 10, 100 );
</span><span class="cx" style="display: block; padding: 0 10px"> // It's only 100 if it has 0 strings.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -54,7 +65,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $percent_class = 90;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> $percent_class = 'percent' . $percent_class;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 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>';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 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>';
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $percent_class = 'percent' . (int) ( $percent / 10 ) * 10;
</span><span class="cx" style="display: block; padding: 0 10px"> echo '<td data-column-title="' . esc_attr( $project_name ) . '" data-sort-value="' . esc_attr( $percent ) . '" class="' . $percent_class .'"><a href="' . esc_url( $projecturl ) . '">' . $percent . '%</a></td>';
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginswporggproutesincclasspluginphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-gp-routes/inc/class-plugin.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-gp-routes/inc/class-plugin.php 2020-04-08 06:32:20 UTC (rev 9710)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-gp-routes/inc/class-plugin.php 2020-04-09 06:54:12 UTC (rev 9711)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -46,6 +46,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'gp_locale_glossary_path_prefix', [ $this, 'set_locale_glossary_path_prefix' ] );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'init', [ $this, 'respect_robots_txt' ], 9 );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ add_action( 'init', [ $this, 'cron_tasks' ] );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -60,6 +62,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * 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' ] );
+ }
+
+ /**
</ins><span class="cx" style="display: block; padding: 0 10px"> * Changes the path prefix for a locale glossary to '/locale'.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @return string '/locale'
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginswporggproutesincroutesclassstatsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-gp-routes/inc/routes/class-stats.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-gp-routes/inc/routes/class-stats.php 2020-04-08 06:32:20 UTC (rev 9710)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-gp-routes/inc/routes/class-stats.php 2020-04-09 06:54:12 UTC (rev 9711)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -13,6 +13,45 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> class Stats extends GP_Route {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**
+ * 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 );
+ }
+
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> public function get_stats_overview() {
</span><span class="cx" style="display: block; padding: 0 10px"> global $wpdb;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -26,6 +65,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'apps/android' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> 'apps/ios' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> 'waiting' => false,
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'wp-themes' => false,
+ 'wp-plugins' => false,
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // I'm sure there's somewhere to fetch these from statically defined
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -83,30 +124,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> unset( $rows, $locale_key, $set );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Append the Plugins/Themes waiting strings
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /*$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;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 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;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $translation_locale_statuses[ $locale_key ]['waiting'] += (int) $set->waiting_strings;
- }*/
-
</del><span class="cx" style="display: block; padding: 0 10px"> // Calculate a list of [Locale] = % subtotals
</span><span class="cx" style="display: block; padding: 0 10px"> $translation_locale_complete = array();
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $translation_locale_statuses as $locale => $sets ) {
</span></span></pre>
</div>
</div>
</body>
</html>