<!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>[1780] sites/trunk/translate.wordpress.org/includes/gp-plugins/wporg-routes/routes/locale.php: Translate: Show only active top level projects in the filter bar.</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/1780">1780</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/1780","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 10:43:49 +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: Show only active top level projects in the filter bar.
see <a href="http://meta.trac.wordpress.org/ticket/1091">#1091</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunktranslatewordpressorgincludesgppluginswporgroutesrouteslocalephp">sites/trunk/translate.wordpress.org/includes/gp-plugins/wporg-routes/routes/locale.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunktranslatewordpressorgincludesgppluginswporgroutesrouteslocalephp"></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/routes/locale.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/routes/locale.php 2015-07-22 11:09:40 UTC (rev 1779)
+++ sites/trunk/translate.wordpress.org/includes/gp-plugins/wporg-routes/routes/locale.php 2015-07-23 10:43:49 UTC (rev 1780)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -68,7 +68,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $contributors_count = array();
</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">- $top_level_projects = GP::$project->top_level();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $top_level_projects = $this->get_active_top_level_projects();
</ins><span class="cx" style="display: block; padding: 0 10px"> usort( $top_level_projects, array( $this, '_sort_reverse_name_callback' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $variants = $this->get_locale_variants( $locale_slug, $project_ids );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -198,11 +198,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> private function get_locale_variants( $locale, $project_ids ) {
</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">- $table = GP::$translation_set->table;
</del><span class="cx" style="display: block; padding: 0 10px"> $project_ids = implode( ',', $project_ids );
</span><span class="cx" style="display: block; padding: 0 10px"> $slugs = $gpdb->get_col( $gpdb->prepare( "
</span><span class="cx" style="display: block; padding: 0 10px"> SELECT DISTINCT(slug), name
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- FROM $table
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ FROM {$gpdb->translation_sets}
</ins><span class="cx" style="display: block; padding: 0 10px"> WHERE
</span><span class="cx" style="display: block; padding: 0 10px"> project_id IN( $project_ids )
</span><span class="cx" style="display: block; padding: 0 10px"> AND locale = %s
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -277,9 +276,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return array List of sub projects.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> private function get_active_sub_projects( $project, $with_sub_projects = false ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ global $gpdb;
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $_projects = $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 $project->table
</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"> parent_project_id = %d AND
</span><span class="cx" style="display: block; padding: 0 10px"> active = 1
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -294,7 +295,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // e.g. wp/dev/admin/network
</span><span class="cx" style="display: block; padding: 0 10px"> $sub_projects = $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 $project->table
</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"> parent_project_id = %d AND
</span><span class="cx" style="display: block; padding: 0 10px"> active = 1
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -366,13 +367,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Once we have the sets in 3, we can then check to see if there exists any translation sets for the current (locale, slug) (ie. en-au/default)
</span><span class="cx" style="display: block; padding: 0 10px"> * If not, we can simply filter them out, so that paging only has items returned that actually exist.
</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_sets_table = GP::$translation_set->table;
</del><span class="cx" style="display: block; padding: 0 10px"> $_projects = $project->many( "
</span><span class="cx" style="display: block; padding: 0 10px"> SELECT SQL_CALC_FOUND_ROWS tp.*
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- FROM {$project->table} tp
- LEFT JOIN {$project->table} tp_sub ON tp.id = tp_sub.parent_project_id AND tp_sub.active = 1
- LEFT JOIN {$translation_sets_table} sets ON sets.project_id = tp.id AND sets.locale = %s AND sets.slug = %s
- LEFT JOIN {$translation_sets_table} sets_sub ON sets_sub.project_id = tp_sub.id AND sets_sub.locale = %s AND sets_sub.slug = %s
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ FROM {$gpdb->projects} tp
+ LEFT JOIN {$gpdb->projects} tp_sub ON tp.id = tp_sub.parent_project_id AND tp_sub.active = 1
+ LEFT JOIN {$gpdb->translation_sets} sets ON sets.project_id = tp.id AND sets.locale = %s AND sets.slug = %s
+ LEFT JOIN {$gpdb->translation_sets} sets_sub ON sets_sub.project_id = tp_sub.id AND sets_sub.locale = %s AND sets_sub.slug = %s
</ins><span class="cx" style="display: block; padding: 0 10px"> WHERE
</span><span class="cx" style="display: block; padding: 0 10px"> tp.parent_project_id = %d
</span><span class="cx" style="display: block; padding: 0 10px"> AND tp.active = 1
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -384,7 +384,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ", $locale, $set_slug, $locale, $set_slug, $project->id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $results = (int) $project->found_rows();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $pages = (int)ceil( $results / $per_page );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $pages = (int) ceil( $results / $per_page );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $projects = array();
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $_projects as $project ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -397,6 +397,24 @@
</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">+ /**
+ * Retrieves active top level projects.
+ *
+ * @return array List of top level projects.
+ */
+ public function get_active_top_level_projects() {
+ global $gpdb;
+
+ return GP::$project->many( "
+ SELECT *
+ FROM {$gpdb->projects}
+ WHERE
+ parent_project_id IS NULL
+ AND active = 1
+ ORDER BY name ASC
+ " );
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> private function _sort_reverse_name_callback( $a, $b ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return - strcasecmp( $a->name, $b->name );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre>
</div>
</div>
</body>
</html>