<!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>[2108] sites/trunk/translate.wordpress.org/includes/gp-plugins: Translate: Move the wporg-stats-overview plugin into the wporg-routes 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/2108">2108</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/2108","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 19:00:56 +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: Move the wporg-stats-overview plugin into the wporg-routes plugin.
See <a href="http://meta.trac.wordpress.org/ticket/1352">#1352</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunktranslatewordpressorgincludesgppluginswporgrouteswporgroutesphp">sites/trunk/translate.wordpress.org/includes/gp-plugins/wporg-routes/wporg-routes.php</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#sitestrunktranslatewordpressorgincludesgppluginswporgroutesroutesstatsoverviewphp">sites/trunk/translate.wordpress.org/includes/gp-plugins/wporg-routes/routes/stats-overview.php</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<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="sitestrunktranslatewordpressorgincludesgppluginswporgroutesroutesstatsoverviewphpfromrev2107sitestrunktranslatewordpressorgincludesgppluginswporgstatsoverviewphp"></a>
<div class="copfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Copied: sites/trunk/translate.wordpress.org/includes/gp-plugins/wporg-routes/routes/stats-overview.php (from rev 2107, 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-routes/routes/stats-overview.php (rev 0)
+++ sites/trunk/translate.wordpress.org/includes/gp-plugins/wporg-routes/routes/stats-overview.php 2015-11-22 19:00:56 UTC (rev 2108)
</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 GP_WPorg_Route_Stats extends GP_Route {
+
+ public function get_stats_overview() {
+ global $gpdb;
+
+ $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 {$gpdb->prefix}project_translation_status stats
+ LEFT JOIN {$gpdb->prefix}projects p ON stats.project_id = p.id
+ WHERE
+ p.path IN ( $all_project_paths_sql )
+ AND p.active = 1";
+
+ $rows = $gpdb->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 {$gpdb->prefix}project_translation_status stats
+ LEFT JOIN {$gpdb->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 = $gpdb->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="sitestrunktranslatewordpressorgincludesgppluginswporgrouteswporgroutesphp"></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/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-22 18:47:02 UTC (rev 2107)
+++ sites/trunk/translate.wordpress.org/includes/gp-plugins/wporg-routes/wporg-routes.php 2015-11-22 19:00:56 UTC (rev 2108)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2,12 +2,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Register custom routes 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">- * @author ocean90
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @author ocean90, obenland, dd32
</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"> require_once __DIR__ . '/routes/redirector.php';
</span><span class="cx" style="display: block; padding: 0 10px"> require_once __DIR__ . '/routes/index.php';
</span><span class="cx" style="display: block; padding: 0 10px"> require_once __DIR__ . '/routes/locale.php';
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+require_once __DIR__ . '/routes/stats-overview.php';
</ins><span class="cx" style="display: block; padding: 0 10px"> require_once __DIR__ . '/routes/wp-plugins.php';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> class GP_WPorg_Routes extends GP_Plugin {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -42,7 +43,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> GP::$router->prepend( "/locale/$locale/$path", array( 'GP_WPorg_Route_Locale', 'get_locale_projects' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> GP::$router->prepend( "/locale/$locale/$path/$path", array( 'GP_WPorg_Route_Locale', 'get_locale_projects' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> GP::$router->prepend( "/locale/$locale/$path/$path/$path", array( 'GP_WPorg_Route_Locale', 'get_locale_project' ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ GP::$router->prepend( '/stats/?', array( 'GP_WPorg_Route_Stats', 'get_stats_overview' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $project = '([^/]*)/?';
</span><span class="cx" style="display: block; padding: 0 10px"> GP::$router->prepend( "/projects/wp-plugins/$project", array( 'GP_WPorg_Route_WP_Plugins', 'get_plugin_projects' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="sitestrunktranslatewordpressorgincludesgppluginswporgstatsoverviewphp"></a>
<div class="delfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Deleted: 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-11-22 18:47:02 UTC (rev 2107)
+++ sites/trunk/translate.wordpress.org/includes/gp-plugins/wporg-stats-overview.php 2015-11-22 19:00:56 UTC (rev 2108)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,147 +0,0 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
-
-/**
- * This plugin offers up the /stats route which provides a overview of our current translation efforts.
- *
- * @author dd32
- */
-class GP_WPorg_Stats_Overview extends GP_Plugin {
- var $id = 'wporg-stats-overview';
-
- function __construct() {
- parent::__construct();
- $this->add_action( 'init' );
-
- }
-
- function init() {
- GP::$router->prepend( "/stats/?", array( 'GP_WPorg_Route_Stats', 'get_stats_overview' ) );
- }
-}
-
-GP::$plugins->wporg_stats_overview = new GP_WPorg_Stats_Overview;
-
-class GP_WPorg_Route_Stats extends GP_Route {
-
- public function get_stats_overview() {
- global $gpdb;
-
- $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 {$gpdb->prefix}project_translation_status stats
- LEFT JOIN {$gpdb->prefix}projects p ON stats.project_id = p.id
- WHERE
- p.path IN ( $all_project_paths_sql )
- AND p.active = 1";
-
- $rows = $gpdb->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 {$gpdb->prefix}project_translation_status stats
- LEFT JOIN {$gpdb->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 = $gpdb->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() );
- }
-
-}
</del></span></pre>
</div>
</div>
</body>
</html>