<!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>[1881] sites/trunk/translate.wordpress.org/includes/gp-plugins: Translate: Update the Project Stats plugin to store data in an easier to parse format.</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 { 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/1881">1881</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/1881","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>2015-09-17 03:05:18 +0000 (Thu, 17 Sep 2015)</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: Update the Project Stats plugin to store data in an easier to parse format.
 * Stores a Locale + Locale slug (ie. en-au/default) rather than a translation set id
 * Projects now include their sub-projects in their counts. A project no longer has to have sets directly on it for it's status to be queried.
 * Updates the Stats overview to take advantage of these optimizations.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunktranslatewordpressorgincludesgppluginswporgprojectstatsphp">sites/trunk/translate.wordpress.org/includes/gp-plugins/wporg-project-stats.php</a></li>
<li><a href="#sitestrunktranslatewordpressorgincludesgppluginswporgstatsoverviewphp">sites/trunk/translate.wordpress.org/includes/gp-plugins/wporg-stats-overview.php</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunktranslatewordpressorgincludesgppluginswporgprojectstatsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/translate.wordpress.org/includes/gp-plugins/wporg-project-stats.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/translate.wordpress.org/includes/gp-plugins/wporg-project-stats.php   2015-09-15 20:25:11 UTC (rev 1880)
+++ sites/trunk/translate.wordpress.org/includes/gp-plugins/wporg-project-stats.php     2015-09-17 03:05:18 UTC (rev 1881)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -7,13 +7,15 @@
</span><span class="cx" style="display: block; padding: 0 10px">  * a new translation is submitted, or new originals are imported.
</span><span class="cx" style="display: block; padding: 0 10px">  * The datbase update is delayed until shutdown to bulk-update the database during imports.
</span><span class="cx" style="display: block; padding: 0 10px">  *
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * NOTE: The counts includes all sub-projects in the count, as that's more useful for querying (top-level projects excluded)
+ * for example, wp-plugins won't exist, but wp-plugins/akismet will include wp-plugins/akismet/stable wp-plugins/akismet/stable-readme
+ *
</ins><span class="cx" style="display: block; padding: 0 10px">  * @author dd32
</span><span class="cx" style="display: block; padding: 0 10px">  */
</span><span class="cx" style="display: block; padding: 0 10px"> class GP_WPorg_Project_Stats extends GP_Plugin {
</span><span class="cx" style="display: block; padding: 0 10px">        var $id = 'wporg-project-stats';
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        private $projects_to_update = array();
-       private $translation_sets_to_update = array();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public $projects_to_update = array();
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">        function __construct() {
</span><span class="cx" style="display: block; padding: 0 10px">                global $gpdb;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -29,59 +31,112 @@
</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">        function translation_created( $translation ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->translation_sets_to_update[ $translation->translation_set_id ] = true;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $set = GP::$translation_set->get( $translation->translation_set_id );
+               $this->projects_to_update[ $set->project_id ][ $set->locale . '/' . $set->slug ] = true;
</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">        function translation_saved( $translation ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->translation_sets_to_update[ $translation->translation_set_id ] = true;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $set = GP::$translation_set->get( $translation->translation_set_id );
+               $this->projects_to_update[ $set->project_id ][ $set->locale . '/' . $set->slug ] = true;
</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">        function originals_imported( $project_id ) {
</span><span class="cx" style="display: block; padding: 0 10px">                $this->projects_to_update[ $project_id ] = true;
</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">+        // Counts up all the 
+       function get_project_translation_counts( $project_id, $locale, $locale_slug, &$counts = array() ) {
+               if ( ! $counts ) {
+                       $counts = array( 'all' => 0, 'current' => 0, 'waiting' => 0, 'fuzzy' => 0, 'warning' => 0, 'untranslated' => 0 );
+               }
+
+               // Not all projects have translation sets
+               $set = GP::$translation_set->by_project_id_slug_and_locale( $project_id, $locale_slug, $locale );
+               if ( $set ) {
+                       // Force a refresh of the translation set counts
+                       wp_cache_delete( $set->id, 'translation_set_status_breakdown' );
+
+                       $counts['all'] += $set->all_count();
+                       $counts['current'] += $set->current_count();
+                       $counts['waiting'] += $set->waiting_count();
+                       $counts['fuzzy'] += $set->fuzzy_count();
+                       $counts['warnings'] += $set->warnings_count();
+                       $counts['untranslated'] += $set->untranslated_count();
+               }
+
+               // Fetch the strings from the sub projects too
+               foreach ( GP::$project->get( $project_id )->sub_projects() as $project ) {
+                       if ( ! $project->active ) {
+                               continue;
+                       }
+                       $this->get_project_translation_counts( $project->id, $locale, $locale_slug, $counts );
+               }
+
+               return $counts;
+       }
+
</ins><span class="cx" style="display: block; padding: 0 10px">         function shutdown() {
</span><span class="cx" style="display: block; padding: 0 10px">                global $gpdb;
</span><span class="cx" style="display: block; padding: 0 10px">                $values = array();
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Convert projects to a list of sets
-               foreach ( $this->projects_to_update as $project_id => $dummy ) {
-                       foreach ( GP::$translation_set->by_project_id( $project_id ) as $set ) {
-                               $this->translation_sets_to_update[ $set->id ] = true;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // If a project is `true` then we need to fetch all translation sets for it.
+               foreach ( $this->projects_to_update as $project_id => $set_data ) {
+                       if ( true === $set_data ) {
+                               $this->projects_to_update[ $project_id ] = array();
+                               foreach ( GP::$translation_set->by_project_id( $project_id ) as $set ) {
+                                       $this->projects_to_update[ $project_id ][ $set->locale . '/' . $set->slug ] = true;
+                               }
</ins><span class="cx" style="display: block; padding: 0 10px">                         }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        unset( $this->projects_to_update[ $project_id ] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 
</ins><span class="cx" style="display: block; padding: 0 10px">                 }
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                foreach ( $this->translation_sets_to_update as $set_id => $dummy ) {
-                       $set = GP::$translation_set->get( $set_id );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Update all parent projects as well.
+               // This does NOT update a root parent (ie. ! $parent_project_id) as we use those as grouping categories.
+               $projects = $this->projects_to_update;
+               foreach ( $projects as $project_id => $data ) {
+                       // Do all parents
+                       $project = GP::$project->get( $project_id );
+                       while ( $project ) {
+                               $project = GP::$project->get( $project->parent_project_id );
+                               if ( $project->parent_project_id ) {
+                                       $projects[ $project->id ] = $data;
+                               } else {
+                                       break;
+                               }
+                       }
+               }
+               $this->projects_to_update += $projects;
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        unset( $this->translation_sets_to_update[ $set_id ] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         foreach ( $this->projects_to_update as $project_id => $locale_sets ) {
+                       $locale_sets = array_keys( $locale_sets );
+                       $locale_sets = array_map( function( $set ) { return explode( '/', $set ); }, $locale_sets );
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        if ( ! $set ) {
-                               continue;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 foreach ( $locale_sets as $locale_set ) {
+                               list( $locale, $locale_slug ) = $locale_set;
+                               $counts = $this->get_project_translation_counts( $project_id, $locale, $locale_slug );
+       
+                               $values[] = $gpdb->prepare( '(%d, %s, %s, %d, %d, %d, %d, %d, %d)',
+                                       $project_id,
+                                       $locale,
+                                       $locale_slug,
+                                       $counts['all'],
+                                       $counts['current'],
+                                       $counts['waiting'],
+                                       $counts['fuzzy'],
+                                       $counts['warning'],
+                                       $counts['untranslated']
+                               );
</ins><span class="cx" style="display: block; padding: 0 10px">                         }
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $values[] = $gpdb->prepare( '(%d, %d, %d, %d, %d, %d, %d, %d)',
-                               $set->project_id,
-                               $set->id,
-                               $set->all_count(),
-                               $set->current_count(),
-                               $set->waiting_count(),
-                               $set->fuzzy_count(),
-                               $set->warnings_count(),
-                               // Untranslated is ( all - current ), we really want ( all - current - waiting - fuzzy ) which is (untranslated - waiting - fuzzy )
-                               $set->untranslated_count() - $set->waiting_count() - $set->fuzzy_count()
-                       );
-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // If we're processing a large batch, add them as we go to avoid query lengths & memory limits
</ins><span class="cx" style="display: block; padding: 0 10px">                         if ( count( $values ) > 50 ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // If we're processing a large batch, add them as we go to avoid query lengths & memoryl imits
-                               $gpdb->query( "INSERT INTO {$gpdb->project_translation_status} (`project_id`, `translation_set_id`, `all`, `current`, `waiting`, `fuzzy`, `warnings`, `untranslated` ) VALUES " . implode( ', ', $values ) . " ON DUPLICATE KEY UPDATE `all`=VALUES(`all`), `current`=VALUES(`current`), `waiting`=VAlUES(`waiting`), `fuzzy`=VALUES(`fuzzy`), `warnings`=VALUES(`warnings`), `untranslated`=VALUES(`untranslated`)" );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         $gpdb->query( "INSERT INTO {$gpdb->project_translation_status} (`project_id`, `locale`, `locale_slug`, `all`, `current`, `waiting`, `fuzzy`, `warnings`, `untranslated` ) VALUES " . implode( ', ', $values ) . " ON DUPLICATE KEY UPDATE `all`=VALUES(`all`), `current`=VALUES(`current`), `waiting`=VAlUES(`waiting`), `fuzzy`=VALUES(`fuzzy`), `warnings`=VALUES(`warnings`), `untranslated`=VALUES(`untranslated`)" );
</ins><span class="cx" style="display: block; padding: 0 10px">                                 $values = array();
</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><span class="cx" style="display: block; padding: 0 10px">                if ( $values ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $gpdb->query( "INSERT INTO {$gpdb->project_translation_status} (`project_id`, `translation_set_id`, `all`, `current`, `waiting`, `fuzzy`, `warnings`, `untranslated` ) VALUES " . implode( ', ', $values ) . " ON DUPLICATE KEY UPDATE `all`=VALUES(`all`), `current`=VALUES(`current`), `waiting`=VALUES(`waiting`), `fuzzy`=VALUES(`fuzzy`), `warnings`=VALUES(`warnings`), `untranslated`=VALUES(`untranslated`)" );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $gpdb->query( "INSERT INTO {$gpdb->project_translation_status} (`project_id`, `locale`, `locale_slug`, `all`, `current`, `waiting`, `fuzzy`, `warnings`, `untranslated` ) VALUES " . implode( ', ', $values ) . " ON DUPLICATE KEY UPDATE `all`=VALUES(`all`), `current`=VALUES(`current`), `waiting`=VALUES(`waiting`), `fuzzy`=VALUES(`fuzzy`), `warnings`=VALUES(`warnings`), `untranslated`=VALUES(`untranslated`)" );
</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">@@ -94,7 +149,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> CREATE TABLE `gp_project_translation_status` (
</span><span class="cx" style="display: block; padding: 0 10px">   `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
</span><span class="cx" style="display: block; padding: 0 10px">   `project_id` int(10) unsigned NOT NULL,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-  `translation_set_id` int(10) unsigned NOT NULL,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  `locale` varchar(10) NOT NULL,
+  `locale_slug` varchar(255) NOT NULL,
</ins><span class="cx" style="display: block; padding: 0 10px">   `all` int(10) unsigned NOT NULL DEFAULT '0',
</span><span class="cx" style="display: block; padding: 0 10px">   `current` int(10) unsigned NOT NULL DEFAULT '0',
</span><span class="cx" style="display: block; padding: 0 10px">   `waiting` int(10) unsigned NOT NULL DEFAULT '0',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -102,7 +158,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">   `warnings` int(10) unsigned NOT NULL DEFAULT '0',
</span><span class="cx" style="display: block; padding: 0 10px">   `untranslated` int(10) unsigned NOT NULL DEFAULT '0',
</span><span class="cx" style="display: block; padding: 0 10px">   PRIMARY KEY (`id`),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-  UNIQUE KEY `project_translation_set` (`project_id`,`translation_set_id`),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  UNIQUE KEY `project_locale` (`project_id`,`locale`,`locale_slug`),
</ins><span class="cx" style="display: block; padding: 0 10px">   KEY `all` (`all`),
</span><span class="cx" style="display: block; padding: 0 10px">   KEY `current` (`current`),
</span><span class="cx" style="display: block; padding: 0 10px">   KEY `waiting` (`waiting`),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -112,3 +168,4 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ) ENGINE=InnoDB DEFAULT CHARSET=latin1;
</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">+
</ins></span></pre></div>
<a id="sitestrunktranslatewordpressorgincludesgppluginswporgstatsoverviewphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/translate.wordpress.org/includes/gp-plugins/wporg-stats-overview.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/translate.wordpress.org/includes/gp-plugins/wporg-stats-overview.php  2015-09-15 20:25:11 UTC (rev 1880)
+++ sites/trunk/translate.wordpress.org/includes/gp-plugins/wporg-stats-overview.php    2015-09-17 03:05:18 UTC (rev 1881)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -43,43 +43,21 @@
</span><span class="cx" style="display: block; padding: 0 10px">                        $projects = array_merge( array( $wp_sub_project->path => $wp_sub_project ), $projects );
</span><span class="cx" style="display: block; padding: 0 10px">                }
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $all_project_ids = $sql_cases = array();
-               foreach ( $projects as $slug => &$project ) {
-                       $project_ids = array();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Load the projects for each display item
+               array_walk( $projects, function( &$project, $project_slug ) {
</ins><span class="cx" style="display: block; padding: 0 10px">                         if ( ! $project ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                $project = GP::$project->by_path( $slug );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         $project = GP::$project->by_path( $project_slug );
</ins><span class="cx" style="display: block; padding: 0 10px">                         }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $project_ids[] = $project->id;
</del><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">-                        foreach ( $project->inclusive_sub_projects() as $sub ) {
-                               if ( $sub->active ) {
-                                       $project_ids[] = $sub->id;
-                               }
-                       }
-                       unset( $sub );
-
-                       $project_id_list = implode( ', ', array_map( 'intval', $project_ids ) );
-                       $sql_cases[] = $gpdb->prepare( "WHEN ts.project_id IN( $project_id_list ) THEN %s", $slug );
-
-                       $all_project_ids = array_merge( $all_project_ids, $project_ids );
-               }
-               unset( $slug, $project_ids, $subs, $project );
-
-               $sql_cases = implode( "\n", $sql_cases );
-               $all_project_ids = implode( ', ', array_map( 'intval', $all_project_ids ) );
-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $all_project_paths_sql = '"' . implode( '", "', array_keys( $projects ) ) . '"';
</ins><span class="cx" style="display: block; padding: 0 10px">                 $sql = "SELECT
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                CASE
-                                       $sql_cases
-                               END as project_slug,
-                               s.locale as locale,
-                               s.slug as locale_slug,
-                               (100 * SUM(ts.current)/SUM(ts.all)) as percent_complete
-                       FROM translate_project_translation_status ts
-                               LEFT JOIN translate_translation_sets s ON ts.project_id = s.project_id AND ts.translation_set_id = s.id
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         path, locale, locale_slug,
+                               (100 * stats.current/stats.all) as percent_complete
+                       FROM {$gpdb->prefix}project_translation_status stats
+                               LEFT JOIN {$gpdb->prefix}projects p ON stats.project_id = p.id
</ins><span class="cx" style="display: block; padding: 0 10px">                         WHERE
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                ts.project_id IN ( $all_project_ids )
-                       GROUP BY project_slug, s.locale, s.slug";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         p.path IN ( $all_project_paths_sql )";
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                $rows = $gpdb->get_results( $sql );
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -90,7 +68,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                        if ( 'default' != $set->locale_slug ) {
</span><span class="cx" style="display: block; padding: 0 10px">                                $locale_key = $set->locale . '/' . $set->locale_slug;
</span><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 ][ $set->project_slug ] = floor( (float) $set->percent_complete );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $translation_locale_statuses[ $locale_key ][ $set->path ] = floor( (float) $set->percent_complete );
</ins><span class="cx" style="display: block; padding: 0 10px">                 }
</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></pre>
</div>
</div>

</body>
</html>