<!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>[2109] sites/trunk/wordpress.org/public_html/wp-content/plugins: Translate: Convert the GP plugin "wporg-routes" to a WP plugin.</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/2109">2109</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/2109","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-11-22 20:01:41 +0000 (Sun, 22 Nov 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: Convert the GP plugin "wporg-routes" to a WP plugin.
See <a href="http://meta.trac.wordpress.org/ticket/1352">#1352</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginswporggproutesroutesindexphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-gp-routes/routes/index.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginswporggproutesrouteslocalephp">sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-gp-routes/routes/locale.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginswporggproutesroutesredirectorphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-gp-routes/routes/redirector.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginswporggproutesrouteswppluginsphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-gp-routes/routes/wp-plugins.php</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li>sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-gp-routes/</li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginswporggproutesroutesstatsoverviewphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-gp-routes/routes/stats-overview.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginswporggprouteswporggproutesphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-gp-routes/wporg-gp-routes.php</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li>sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-gp-routes/cli/</li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginswporggprouteswporgroutesphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-gp-routes/wporg-routes.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginswporggproutesroutesindexphp"></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/routes/index.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/index.php 2015-11-20 19:33:16 UTC (rev 2102)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-gp-routes/routes/index.php 2015-11-22 20:01:41 UTC (rev 2109)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4,7 +4,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * Provides the route for translate.wordpress.org/.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-class GP_WPorg_Route_Index extends GP_Route {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+class WPorg_GP_Route_Index extends GP_Route {
</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"> * Prints all exisiting locales as cards.
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginswporggproutesrouteslocalephp"></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/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-11-20 19:33:16 UTC (rev 2102)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-gp-routes/routes/locale.php 2015-11-22 20:01:41 UTC (rev 2109)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -10,7 +10,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * Provides the route for translate.wordpress.org/locale/$locale.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-class GP_WPorg_Route_Locale extends GP_Route {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+class WPorg_GP_Route_Locale extends GP_Route {
</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"> * Prints projects/translation sets of a top level project.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -20,7 +20,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $project_path Path of a project.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function get_locale_projects( $locale_slug, $set_slug = 'default', $project_path = false ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- global $gpdb;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ global $wpdb;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $per_page = 20;
</span><span class="cx" style="display: block; padding: 0 10px"> $page = (int) gp_get( 'page', 1 );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -100,7 +100,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $project_ids[] = $project->id;
</span><span class="cx" style="display: block; padding: 0 10px"> $project_ids = array_merge(
</span><span class="cx" style="display: block; padding: 0 10px"> $project_ids,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $gpdb->get_col( "SELECT id FROM {$gpdb->projects} WHERE parent_project_id IN(" . implode(', ', $project_ids ) . ")" )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $wpdb->get_col( "SELECT id FROM {$wpdb->projects} WHERE parent_project_id IN(" . implode(', ', $project_ids ) . ")" )
</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"> $contributors_count = wp_cache_get( 'contributors-count', 'wporg-translate' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -243,12 +243,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return array List of non-default slugs.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> private function get_locale_variants( $locale, $project_ids ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- global $gpdb;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ global $wpdb;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $project_ids = implode( ',', $project_ids );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $slugs = $gpdb->get_col( $gpdb->prepare( "
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $slugs = $wpdb->get_col( $wpdb->prepare( "
</ins><span class="cx" style="display: block; padding: 0 10px"> SELECT DISTINCT slug
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- FROM {$gpdb->translation_sets}
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ FROM {$wpdb->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">@@ -323,11 +323,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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- global $gpdb;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ global $wpdb;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><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 {$gpdb->projects}
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ FROM {$wpdb->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">@@ -342,7 +342,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 {$gpdb->projects}
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ FROM {$wpdb->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">@@ -378,7 +378,7 @@
</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_paged_active_sub_projects( $project, $args = array() ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- global $gpdb;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ global $wpdb;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $defaults = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'per_page' => 20,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -393,15 +393,15 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $limit_sql = '';
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $per_page ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $limit_sql = $gpdb->prepare( 'LIMIT %d, %d', ( $page - 1 ) * $per_page, $per_page );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $limit_sql = $wpdb->prepare( 'LIMIT %d, %d', ( $page - 1 ) * $per_page, $per_page );
</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">- $parent_project_sql = $gpdb->prepare( 'AND tp.parent_project_id = %d', $project->id );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $parent_project_sql = $wpdb->prepare( 'AND tp.parent_project_id = %d', $project->id );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $search_sql = '';
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $search ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $esc_search = '%%' . like_escape( $search ) . '%%';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $search_sql = $gpdb->prepare( 'AND ( tp.name LIKE %s OR tp.slug LIKE %s )', $esc_search, $esc_search );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $search_sql = $wpdb->prepare( 'AND ( tp.name LIKE %s OR tp.slug LIKE %s )', $esc_search, $esc_search );
</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"> // Special Waiting Project Tab
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -447,7 +447,7 @@
</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"> // Limit to only showing base-level projects
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $parent_project_sql .= " AND tp.parent_project_id IN( (SELECT id FROM {$gpdb->projects} WHERE parent_project_id IS NULL AND active = 1) )";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $parent_project_sql .= " AND tp.parent_project_id IN( (SELECT id FROM {$wpdb->projects} WHERE parent_project_id IS NULL AND active = 1) )";
</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">@@ -462,7 +462,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> default:
</span><span class="cx" style="display: block; padding: 0 10px"> case 'special':
</span><span class="cx" style="display: block; padding: 0 10px"> // Float favorites to the start, but only if they have untranslated strings
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $user_fav_projects = array_map( array( $gpdb, 'escape' ), $this->get_user_favorites( $project->slug ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $user_fav_projects = array_map( array( $wpdb, 'escape' ), $this->get_user_favorites( $project->slug ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Float Favorites to the start, float fully translated to the bottom, order the rest by name
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $user_fav_projects ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -474,7 +474,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> case 'favorites':
</span><span class="cx" style="display: block; padding: 0 10px"> // Only list favorites
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $user_fav_projects = array_map( array( $gpdb, 'escape' ), $this->get_user_favorites( $project->slug ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $user_fav_projects = array_map( array( $wpdb, 'escape' ), $this->get_user_favorites( $project->slug ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $user_fav_projects ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $filter_where = 'AND tp.path IN( "' . implode( '", "', $user_fav_projects ) . '" )';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -512,8 +512,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><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 {$gpdb->projects} tp
- LEFT JOIN {$gpdb->project_translation_status} stats ON stats.project_id = tp.id AND stats.locale = %s AND stats.locale_slug = %s
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ FROM {$wpdb->projects} tp
+ LEFT JOIN {$wpdb->project_translation_status} stats ON stats.project_id = tp.id AND stats.locale = %s AND stats.locale_slug = %s
</ins><span class="cx" style="display: block; padding: 0 10px"> WHERE
</span><span class="cx" style="display: block; padding: 0 10px"> tp.active = 1
</span><span class="cx" style="display: block; padding: 0 10px"> $parent_project_sql
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -545,7 +545,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return array List of favorited items, eg [ 'wp-themes/twentyten', 'wp-themes/twentyeleven' ]
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function get_user_favorites( $project_slug = false ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- global $gpdb;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ global $wpdb;
</ins><span class="cx" style="display: block; padding: 0 10px"> $user = GP::$user->current();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $user->id ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -571,7 +571,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $plugin_fav_slugs = array();
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $plugin_fav_ids ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $plugin_fav_ids = implode( ',', array_map( 'intval', $plugin_fav_ids ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $plugin_fav_slugs = $gpdb->get_col( "SELECT topic_slug FROM " . PLUGINS_TABLE_PREFIX . "topics WHERE topic_id IN( $plugin_fav_ids )" );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $plugin_fav_slugs = $wpdb->get_col( "SELECT topic_slug FROM " . PLUGINS_TABLE_PREFIX . "topics WHERE topic_id IN( $plugin_fav_ids )" );
</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"> $plugin_favorites = array_map( function( $slug ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -593,11 +593,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return array List of top level projects.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function get_active_top_level_projects() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- global $gpdb;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ global $wpdb;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return 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 {$wpdb->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 IS NULL
</span><span class="cx" style="display: block; padding: 0 10px"> AND active = 1
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginswporggproutesroutesredirectorphp"></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/routes/redirector.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/redirector.php 2015-11-20 19:33:16 UTC (rev 2102)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-gp-routes/routes/redirector.php 2015-11-22 20:01:41 UTC (rev 2109)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4,7 +4,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * Provides redirection routes.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-class GP_WPorg_Route_Redirector extends GP_Route {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+class WPorg_GP_Route_Redirector extends GP_Route {
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> function redirect_languages( $path = '' ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $path ) ) {
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginswporggproutesroutesstatsoverviewphpfromrev2108sitestrunktranslatewordpressorgincludesgppluginswporgroutesroutesstatsoverviewphp"></a>
<div class="copfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Copied: sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-gp-routes/routes/stats-overview.php (from rev 2108, sites/trunk/translate.wordpress.org/includes/gp-plugins/wporg-routes/routes/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-routes/routes/stats-overview.php (rev 0)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-gp-routes/routes/stats-overview.php 2015-11-22 20:01:41 UTC (rev 2109)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,130 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+/**
+ * Stats Route Class.
+ *
+ * Provides the route for translate.wordpress.org/stats.
+ */
+class WPorg_GP_Route_Stats extends GP_Route {
+
+ public function get_stats_overview() {
+ global $wpdb;
+
+ $projects = array(
+ 'meta/rosetta' => false,
+ 'meta/browsehappy' => false,
+ 'meta/themes' => false,
+ 'meta/plugins' => false,
+ 'meta/forums' => false,
+ 'apps/android' => false,
+ 'apps/ios' => false,
+ 'waiting' => false,
+ );
+
+ // I'm sure there's somewhere to fetch these from statically defined
+ $wp_project = GP::$project->by_path('wp');
+ foreach ( GP::$project->find_many( array( 'parent_project_id' => $wp_project->id, 'active' => 1 ) ) as $wp_sub_project ) {
+ // Prefix the WordPress projects...
+ $wp_sub_project->name = $wp_project->name . ' ' . $wp_sub_project->name;
+ $projects = array_merge( array( $wp_sub_project->path => $wp_sub_project ), $projects );
+ }
+
+ // Load the projects for each display item
+ array_walk( $projects, function( &$project, $project_slug ) {
+ if ( ! $project ) {
+ $project = GP::$project->by_path( $project_slug );
+ }
+ } );
+
+ $all_project_paths_sql = '"' . implode( '", "', array_keys( $projects ) ) . '"';
+ $sql = "SELECT
+ path, locale, locale_slug,
+ (100 * stats.current/stats.all) as percent_complete,
+ stats.waiting+stats.fuzzy as waiting_strings
+ FROM {$wpdb->prefix}project_translation_status stats
+ LEFT JOIN {$wpdb->prefix}projects p ON stats.project_id = p.id
+ WHERE
+ p.path IN ( $all_project_paths_sql )
+ AND p.active = 1";
+
+ $rows = $wpdb->get_results( $sql );
+
+ // Split out into $[Locale][Project] = %
+ $translation_locale_statuses = array();
+ foreach ( $rows as $set ) {
+ $locale_key = $set->locale;
+ if ( 'default' != $set->locale_slug ) {
+ $locale_key = $set->locale . '/' . $set->locale_slug;
+ }
+
+ /*
+ * > 50% round down, so that a project with all strings except 1 translated shows 99%, instead of 100%.
+ * < 50% round up, so that a project with just a few strings shows 1%, instead of 0%.
+ */
+ $percent_complete = (float) $set->percent_complete;
+ $percent_complete = ( $percent_complete > 50 ) ? floor( $percent_complete ) : ceil( $percent_complete );
+ $translation_locale_statuses[ $locale_key ][ $set->path ] = $percent_complete;
+
+ if ( ! isset( $translation_locale_statuses[ $locale_key ]['waiting'] ) ) {
+ $translation_locale_statuses[ $locale_key ]['waiting'] = 0;
+ }
+ $translation_locale_statuses[ $locale_key ]['waiting'] += (int) $set->waiting_strings;
+ }
+ unset( $rows, $locale_key, $set );
+
+ // 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->prefix}project_translation_status stats
+ LEFT JOIN {$wpdb->prefix}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;
+ }
+
+ // Calculate a list of [Locale] = % subtotals
+ $translation_locale_complete = array();
+ foreach ( $translation_locale_statuses as $locale => $sets ) {
+ unset( $sets['waiting'] );
+ $sets_count = count( $sets );
+ if ( $sets_count ) {
+ $translation_locale_complete[ $locale ] = round( array_sum( $sets ) / $sets_count, 3 );
+ } else {
+ $translation_locale_complete[ $locale ] = 0;
+ }
+ }
+ unset( $locale, $sets );
+
+ // Sort by translation completeness, least number of waiting strings, and locale slug.
+ uksort( $translation_locale_complete, function ( $a, $b ) use ( $translation_locale_complete, $translation_locale_statuses ) {
+ if ( $translation_locale_complete[ $a ] < $translation_locale_complete[ $b ] ) {
+ return 1;
+ } elseif ( $translation_locale_complete[ $a ] == $translation_locale_complete[ $b ] ) {
+ if ( $translation_locale_statuses[ $a ]['waiting'] != $translation_locale_statuses[ $b ]['waiting'] ) {
+ return strnatcmp( $translation_locale_statuses[ $a ]['waiting'], $translation_locale_statuses[ $b ]['waiting'] );
+ } else {
+ return strnatcmp( $a, $b );
+ }
+ } else {
+ return -1;
+ }
+ } );
+
+ $this->tmpl( 'stats-overview', get_defined_vars() );
+ }
+
+}
</ins></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginswporggproutesrouteswppluginsphp"></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/routes/wp-plugins.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/wp-plugins.php 2015-11-20 19:33:16 UTC (rev 2102)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-gp-routes/routes/wp-plugins.php 2015-11-22 20:01:41 UTC (rev 2109)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,9 +1,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-class GP_WPorg_Route_WP_Plugins extends GP_Route {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+class WPorg_GP_Route_WP_Plugins extends GP_Route {
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> public function get_plugin_projects( $project_slug ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- global $gpdb;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ global $wpdb;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $project_path = 'wp-plugins/' . $project_slug;
</span><span class="cx" style="display: block; padding: 0 10px"> $project = GP::$project->by_path( $project_path );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -11,14 +11,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return $this->die_with_404();
</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">- $rows = $gpdb->get_results( "
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $rows = $wpdb->get_results( "
</ins><span class="cx" style="display: block; padding: 0 10px"> SELECT
</span><span class="cx" style="display: block; padding: 0 10px"> path, locale, locale_slug,
</span><span class="cx" style="display: block; padding: 0 10px"> (100 * stats.current/stats.all) as percent_complete,
</span><span class="cx" style="display: block; padding: 0 10px"> stats.waiting+stats.fuzzy as waiting_strings,
</span><span class="cx" style="display: block; padding: 0 10px"> stats.untranslated as untranslated
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- FROM {$gpdb->prefix}project_translation_status stats
- LEFT JOIN {$gpdb->prefix}projects p ON stats.project_id = p.id
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ FROM {$wpdb->prefix}project_translation_status stats
+ LEFT JOIN {$wpdb->prefix}projects p ON stats.project_id = p.id
</ins><span class="cx" style="display: block; padding: 0 10px"> WHERE
</span><span class="cx" style="display: block; padding: 0 10px"> p.parent_project_id = '{$project->id}'
</span><span class="cx" style="display: block; padding: 0 10px"> " );
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginswporggprouteswporggproutesphpfromrev2108sitestrunktranslatewordpressorgincludesgppluginswporgrouteswporgroutesphp"></a>
<div class="copfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Copied: sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-gp-routes/wporg-gp-routes.php (from rev 2108, sites/trunk/translate.wordpress.org/includes/gp-plugins/wporg-routes/wporg-routes.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/wporg-gp-routes.php (rev 0)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-gp-routes/wporg-gp-routes.php 2015-11-22 20:01:41 UTC (rev 2109)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,58 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+/**
+ * Plugin name: GlotPress: Register custom routes for translate.wordpress.org.
+ * Plugin author: ocean90, obenland, dd32
+ */
+
+require_once __DIR__ . '/routes/redirector.php';
+require_once __DIR__ . '/routes/index.php';
+require_once __DIR__ . '/routes/locale.php';
+require_once __DIR__ . '/routes/stats-overview.php';
+require_once __DIR__ . '/routes/wp-plugins.php';
+
+class WPorg_GP_Routes {
+
+ public function __construct() {
+ add_action( 'init', array( $this, 'register_routes' ) );
+ }
+
+ public function register_routes() {
+ // Bail for API requests.
+ $request_uri = GP::$router->request_uri();
+ if ( gp_startswith( $request_uri, '/' . GP::$router->api_prefix . '/' ) ) {
+ return;
+ }
+
+ $path = '(.+?)';
+ $locale = '(' . implode( '|', array_map( function( $locale ) { return $locale->slug; }, GP_Locales::locales() ) ) . ')';
+
+ // Delete default routes.
+ GP::$router->remove("/languages/$locale");
+ GP::$router->remove("/languages/$locale/$path");
+
+ // Redirect routes.
+ GP::$router->prepend( '/languages', array( 'WPorg_GP_Route_Redirector', 'redirect_languages' ) );
+ GP::$router->prepend( "/languages/$path", array( 'WPorg_GP_Route_Redirector', 'redirect_languages' ) );
+
+ // Register custom routes.
+ GP::$router->prepend( '/', array( 'WPorg_GP_Route_Index', 'get_locales' ) );
+ GP::$router->prepend( "/locale/$locale", array( 'WPorg_GP_Route_Locale', 'get_locale_projects' ) );
+ GP::$router->prepend( "/locale/$locale/$path", array( 'WPorg_GP_Route_Locale', 'get_locale_projects' ) );
+ GP::$router->prepend( "/locale/$locale/$path/$path", array( 'WPorg_GP_Route_Locale', 'get_locale_projects' ) );
+ GP::$router->prepend( "/locale/$locale/$path/$path/$path", array( 'WPorg_GP_Route_Locale', 'get_locale_project' ) );
+ GP::$router->prepend( '/stats/?', array( 'WPorg_GP_Route_Stats', 'get_stats_overview' ) );
+ $project = '([^/]*)/?';
+ GP::$router->prepend( "/projects/wp-plugins/$project", array( 'WPorg_GP_Route_WP_Plugins', 'get_plugin_projects' ) );
+ }
+}
+
+function wporg_gp_routes() {
+ global $wporg_gp_routes;
+
+ if ( ! isset( $wporg_gp_routes ) ) {
+ $wporg_gp_routes = new WPorg_GP_Routes();
+ }
+
+ return $wporg_gp_routes;
+}
+add_action( 'plugins_loaded', 'wporg_gp_routes' );
</ins></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginswporggprouteswporgroutesphp"></a>
<div class="delfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Deleted: sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-gp-routes/wporg-routes.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/wporg-routes.php 2015-11-20 19:33:16 UTC (rev 2102)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-gp-routes/wporg-routes.php 2015-11-22 20:01:41 UTC (rev 2109)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,51 +0,0 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
-/**
- * Register custom routes for translate.wordpress.org.
- *
- * @author ocean90
- */
-
-require_once __DIR__ . '/routes/redirector.php';
-require_once __DIR__ . '/routes/index.php';
-require_once __DIR__ . '/routes/locale.php';
-require_once __DIR__ . '/routes/wp-plugins.php';
-
-class GP_WPorg_Routes extends GP_Plugin {
- public $id = 'wporg-routes';
-
- public function __construct() {
- parent::__construct();
- $this->add_action( 'init' );
- }
-
- public function init() {
- // Bail for API requests.
- $request_uri = GP::$router->request_uri();
- if ( gp_startswith( $request_uri, '/' . GP::$router->api_prefix . '/' ) ) {
- return;
- }
-
- $path = '(.+?)';
- $locale = '(' . implode( '|', array_map( function( $locale ) { return $locale->slug; }, GP_Locales::locales() ) ) . ')';
-
- // Delete default routes.
- GP::$router->remove("/languages/$locale");
- GP::$router->remove("/languages/$locale/$path");
-
- // Redirect routes.
- GP::$router->prepend( '/languages', array( 'GP_WPorg_Route_Redirector', 'redirect_languages' ) );
- GP::$router->prepend( "/languages/$path", array( 'GP_WPorg_Route_Redirector', 'redirect_languages' ) );
-
- // Register custom routes.
- GP::$router->prepend( '/', array( 'GP_WPorg_Route_Index', 'get_locales' ) );
- GP::$router->prepend( "/locale/$locale", array( 'GP_WPorg_Route_Locale', 'get_locale_projects' ) );
- GP::$router->prepend( "/locale/$locale/$path", array( 'GP_WPorg_Route_Locale', 'get_locale_projects' ) );
- GP::$router->prepend( "/locale/$locale/$path/$path", array( 'GP_WPorg_Route_Locale', 'get_locale_projects' ) );
- GP::$router->prepend( "/locale/$locale/$path/$path/$path", array( 'GP_WPorg_Route_Locale', 'get_locale_project' ) );
-
- $project = '([^/]*)/?';
- GP::$router->prepend( "/projects/wp-plugins/$project", array( 'GP_WPorg_Route_WP_Plugins', 'get_plugin_projects' ) );
- }
-}
-
-GP::$plugins->wporg_routes = new GP_WPorg_Routes;
</del></span></pre>
</div>
</div>
</body>
</html>