<!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>[1782] sites/trunk/translate.wordpress.org/includes/gp-plugins/wporg-routes/cli/wporg-update-cached-data.php: Translate: Loop over locales instead of grouping them in SQL.</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/1782">1782</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/1782","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>ocean90</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2015-07-23 20:08:28 +0000 (Thu, 23 Jul 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: Loop over locales instead of grouping them in SQL.
see <a href="http://meta.trac.wordpress.org/ticket/994">#994</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunktranslatewordpressorgincludesgppluginswporgroutescliwporgupdatecacheddataphp">sites/trunk/translate.wordpress.org/includes/gp-plugins/wporg-routes/cli/wporg-update-cached-data.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunktranslatewordpressorgincludesgppluginswporgroutescliwporgupdatecacheddataphp"></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-routes/cli/wporg-update-cached-data.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-routes/cli/wporg-update-cached-data.php 2015-07-23 10:55:08 UTC (rev 1781)
+++ sites/trunk/translate.wordpress.org/includes/gp-plugins/wporg-routes/cli/wporg-update-cached-data.php 2015-07-23 20:08:28 UTC (rev 1782)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -8,7 +8,11 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> public $cache_group = 'wporg-translate';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ private $locales = array();
+
</ins><span class="cx" style="display: block; padding: 0 10px"> public function run() {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->locales = GP::$translation_set->existing_locales();
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->update_contributors_count();
</span><span class="cx" style="display: block; padding: 0 10px"> $this->update_translation_status();
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -19,22 +23,24 @@
</span><span class="cx" style="display: block; padding: 0 10px"> private function update_contributors_count() {
</span><span class="cx" style="display: block; padding: 0 10px"> global $gpdb;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $results = $gpdb->get_results( "
- SELECT ts.locale, COUNT( DISTINCT( t.user_id ) ) AS count
- FROM $gpdb->translations t
- INNER JOIN $gpdb->translation_sets AS ts
- ON ts.id = t.translation_set_id
- WHERE
- ( t.status = 'current' || t.status = 'old' )
- AND t.user_id IS NOT NULL
- AND t.user_id <> '0'
- GROUP BY ts.locale
- " );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $counts = array();
+ foreach ( $this->locales as $locale ) {
+ $result = $gpdb->get_var( $gpdb->prepare( "
+ SELECT COUNT( DISTINCT( t.user_id ) ) AS count
+ FROM {$gpdb->translations} t
+ INNER JOIN {$gpdb->translation_sets} AS ts
+ ON ts.id = t.translation_set_id
+ WHERE
+ ( t.status = 'current' || t.status = 'old' )
+ AND t.user_id IS NOT NULL
+ AND t.user_id <> '0'
+ AND ts.locale = %s
+ ", $locale ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $counts = array();
- if ( $results ) {
- foreach ( $results as $result ) {
- $counts[ $result->locale ] = $result->count;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $result ) {
+ $counts[ $locale ] = $result;
+ } else {
+ $counts[ $locale ] = 0;
</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">@@ -47,17 +53,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> private function update_translation_status() {
</span><span class="cx" style="display: block; padding: 0 10px"> global $gpdb;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $locales = GP::$translation_set->existing_locales();
</del><span class="cx" style="display: block; padding: 0 10px"> $projects = GP::$project->many( "
</span><span class="cx" style="display: block; padding: 0 10px"> SELECT *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- FROM $gpdb->projects
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ FROM {$gpdb->projects}
</ins><span class="cx" style="display: block; padding: 0 10px"> WHERE
</span><span class="cx" style="display: block; padding: 0 10px"> path LIKE 'wp/dev%'
</span><span class="cx" style="display: block; padding: 0 10px"> AND active = '1'
</span><span class="cx" style="display: block; padding: 0 10px"> " );
</span><span class="cx" style="display: block; padding: 0 10px"> $translation_status = array();
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $projects as $project ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- foreach ( $locales as $locale ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ foreach ( $this->locales as $locale ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $set = GP::$translation_set->by_project_id_slug_and_locale(
</span><span class="cx" style="display: block; padding: 0 10px"> $project->id,
</span><span class="cx" style="display: block; padding: 0 10px"> 'default',
</span></span></pre>
</div>
</div>
</body>
</html>