<!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>[2667] sites/trunk: Translate: Enhance the contributors table on project pages of a locale.</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/2667">2667</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/2667","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>2016-03-02 14:54:02 +0000 (Wed, 02 Mar 2016)</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: Enhance the contributors table on project pages of a locale.

See <a href="http://meta.trac.wordpress.org/ticket/1388">#1388</a>.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunktranslatewordpressorgpublic_htmlgptemplatesnewlocaleprojectphp">sites/trunk/translate.wordpress.org/public_html/gp-templates-new/locale-project.php</a></li>
<li><a href="#sitestrunktranslatewordpressorgpublic_htmlgptemplatesnewstylecss">sites/trunk/translate.wordpress.org/public_html/gp-templates-new/style.css</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginswporggproutesrouteslocalephp">sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-gp-routes/routes/locale.php</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunktranslatewordpressorgpublic_htmlgptemplatesnewlocaleprojectphp"></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/public_html/gp-templates-new/locale-project.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/translate.wordpress.org/public_html/gp-templates-new/locale-project.php       2016-03-02 07:52:44 UTC (rev 2666)
+++ sites/trunk/translate.wordpress.org/public_html/gp-templates-new/locale-project.php 2016-03-02 14:54:02 UTC (rev 2667)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -182,41 +182,75 @@
</span><span class="cx" style="display: block; padding: 0 10px">        <div class="locale-project-contributors-group locale-project-contributors-contributors">
</span><span class="cx" style="display: block; padding: 0 10px">                <h3>Translation Contributors</h3>
</span><span class="cx" style="display: block; padding: 0 10px">                <?php if ( $locale_contributors['contributors'] ) : ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                <ul>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         <table class="locale-project-contributors-table">
+                       <thead>
+                               <th class="contributor-name">Contributor</th>
+                               <th class="contributor-stats">Translations*</th>
+                       </thead>
+                       <tbody>
</ins><span class="cx" style="display: block; padding: 0 10px">                         <?php
</span><span class="cx" style="display: block; padding: 0 10px">                        foreach ( $locale_contributors['contributors'] as $contributor ) {
</span><span class="cx" style="display: block; padding: 0 10px">                                printf(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        '<li><a href="https://profiles.wordpress.org/%s/">%s %s</a></li>',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 '<tr>
+                                               <td class="contributor-name">
+                                                       <a href="https://profiles.wordpress.org/%s/">%s %s</a>
+                                                       <span>Last Activity: %s ago</span>
+                                               </td>
+                                               <td class="contributor-stats">
+                                                       <div class="total">
+                                                               <span>Total</span>
+                                                               <p>%s</p>
+                                                       </div>
+                                                       <div class="current">
+                                                               <span>Translated</span>
+                                                               <p>%s</p>
+                                                       </div>
+                                                       <div class="waiting">
+                                                               <span>Suggested</span>
+                                                               <p>%s</p>
+                                                       </div>
+                                                       <div class="fuzzy">
+                                                               <span>Fuzzy</span>
+                                                               <p>%s</p>
+                                                       </div>
+                                               <td>
+                                       </tr>',
</ins><span class="cx" style="display: block; padding: 0 10px">                                         $contributor->nicename,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        get_avatar( $contributor->email, 30 ),
-                                       $contributor->display_name ? $contributor->display_name : $contributor->nicename
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 get_avatar( $contributor->email, 40 ),
+                                       $contributor->display_name ? $contributor->display_name : $contributor->nicename,
+                                       human_time_diff( strtotime(  $contributor->last_update ) ),
+                                       number_format_i18n( $contributor->total_count ),
+                                       number_format_i18n( $contributor->current_count ),
+                                       number_format_i18n( $contributor->waiting_count ),
+                                       number_format_i18n( $contributor->fuzzy_count )
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                </ul>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 </tbody>
+               </table>
+               <p class="stats-hint">* Data for the last 356 days.</p>
</ins><span class="cx" style="display: block; padding: 0 10px">                 <?php else : ?>
</span><span class="cx" style="display: block; padding: 0 10px">                        <p>None, be the first?</p>
</span><span class="cx" style="display: block; padding: 0 10px">                <?php endif; ?>
</span><span class="cx" style="display: block; padding: 0 10px">        </div>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        <div class="locale-project-contributors-group locale-project-contributors-editors">
-               <h3>Translation Editors</h3>
-               <?php if ( $locale_contributors['editors'] ) : ?>
-               <ul>
-                       <?php
-                       foreach ( $locale_contributors['editors'] as $editor ) {
-                               printf(
-                                       '<li><a href="https://profiles.wordpress.org/%s/">%s %s</a></li>',
-                                       $editor->nicename,
-                                       get_avatar( $editor->email, 40 ),
-                                       $editor->display_name ? $editor->display_name : $editor->nicename
-                               );
-                       }
-                       ?>
-               </ul>
-               <?php else : ?>
-                       <p>None, be the first?</p>
-               <?php endif; ?>
-       </div>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+       <?php if ( $locale_contributors['editors'] ) : ?>
+               <div class="locale-project-contributors-group locale-project-contributors-editors">
+                       <h3>Translation Editors</h3>
+                       <ul>
+                               <?php
+                               foreach ( $locale_contributors['editors'] as $editor ) {
+                                       printf(
+                                               '<li><a href="https://profiles.wordpress.org/%s/">%s %s</a></li>',
+                                               $editor->nicename,
+                                               get_avatar( $editor->email, 50 ),
+                                               $editor->display_name ? $editor->display_name : $editor->nicename
+                                       );
+                               }
+                               ?>
+                       </ul>
+               </div>
+       <?php endif; ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> <script>
</span></span></pre></div>
<a id="sitestrunktranslatewordpressorgpublic_htmlgptemplatesnewstylecss"></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/public_html/gp-templates-new/style.css</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/translate.wordpress.org/public_html/gp-templates-new/style.css        2016-03-02 07:52:44 UTC (rev 2666)
+++ sites/trunk/translate.wordpress.org/public_html/gp-templates-new/style.css  2016-03-02 14:54:02 UTC (rev 2667)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1282,9 +1282,19 @@
</span><span class="cx" style="display: block; padding: 0 10px">        display: none !important;
</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">-.locale-project-contributors-group {
-       width: 50%;
-       float: left;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+@media (min-width: 600px) {
+       .locale-project-contributors-group {
+               float: left;
+       }
+
+       .locale-project-contributors-contributors {
+               width: 65%;
+               margin-right: 5%;
+       }
+
+       .locale-project-contributors-editors {
+               width: 30%;
+       }
</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"> .locale-project-contributors-group ul {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1297,7 +1307,97 @@
</span><span class="cx" style="display: block; padding: 0 10px">        margin: 0 0 10px;
</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">-.locale-project-contributors-group li img {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.locale-project-contributors-group .avatar {
</ins><span class="cx" style="display: block; padding: 0 10px">         vertical-align: middle;
</span><span class="cx" style="display: block; padding: 0 10px">        margin-right: 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">+
+.locale-project-contributors-table {
+       width: 100%;
+}
+
+.locale-project-contributors-table .contributor-name {
+       width: 40%;
+}
+
+.locale-project-contributors-table .contributor-name span {
+       font-size: 11px;
+       display: block;
+}
+
+.locale-project-contributors-table tr {
+       vertical-align: top;
+}
+
+.locale-project-contributors-table th {
+       font-weight: bold;
+       border-bottom: 1px solid #eee;
+}
+
+.locale-project-contributors-table th.contributor-stats {
+       text-align: center;
+}
+
+.locale-project-contributors-table td.contributor-stats div {
+       text-align: center;
+       width: 25%;
+       float: left;
+}
+
+.locale-project-contributors-table td.contributor-stats div span {
+       text-transform: uppercase;
+       font-size: 10px;
+}
+
+.locale-project-contributors-table td.contributor-stats div.current span {
+       color: #6bc373;
+}
+
+.locale-project-contributors-table td.contributor-stats div.waiting span {
+       color: #ffc733;
+}
+
+.locale-project-contributors-table td.contributor-stats div.fuzzy span {
+       color: #f78b53;
+}
+
+.locale-project-contributors-table tbody td {
+       padding: 10px 0;
+       border-bottom: 1px solid #eee;
+}
+
+.locale-project-contributors-table tbody tr:last-child td {
+       border-bottom: 0;
+}
+
+.locale-project-contributors-contributors .stats-hint {
+       text-align: right;
+       font-size: 10px;
+}
+
+@media (max-width: 500px) {
+       .locale-project-contributors-table thead {
+               display: none;
+       }
+
+       .locale-project-contributors-table tbody td {
+               width: 100%;
+               display: block;
+       }
+
+       .locale-project-contributors-table .contributor-name,
+       .locale-project-contributors-table .contributor-stats {
+               width: 100%;
+               border-bottom: 0;
+       }
+
+       .locale-project-contributors-table .contributor-stats:before,
+       .locale-project-contributors-table .contributor-stats:after {
+               content: "";
+               display: table;
+       }
+
+       .locale-project-contributors-table .contributor-stats:after {
+               clear: both;
+       }
+}
</ins></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/wordpress.org/public_html/wp-content/plugins/wporg-gp-routes/routes/locale.php        2016-03-02 07:52:44 UTC (rev 2666)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-gp-routes/routes/locale.php  2016-03-02 14:54:02 UTC (rev 2667)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -334,28 +334,46 @@
</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">                // Get the names of the contributors.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                foreach ( $contributors as $contributor_id ) {
-                       if ( isset( $locale_contributors['editors'][ $contributor_id ] ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         foreach ( $contributors as $contributor ) {
+                       if ( isset( $locale_contributors['editors'][ $contributor->user_id ] ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px">                                 continue;
</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">-                        if ( isset( $locale_contributors['contributors'][ $contributor_id ] ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+                       if ( isset( $locale_contributors['contributors'][ $contributor->user_id ] ) ) {
+                               // Update last updated and counts per status.
+                               $locale_contributors['contributors'][ $contributor->user_id ]->last_update = max(
+                                       $locale_contributors['contributors'][ $contributor->user_id ]->last_update,
+                                       $contributor->last_update
+                               );
+
+                               $locale_contributors['contributors'][ $contributor->user_id ]->total_count   += $contributor->total_count;
+                               $locale_contributors['contributors'][ $contributor->user_id ]->current_count += $contributor->current_count;
+                               $locale_contributors['contributors'][ $contributor->user_id ]->waiting_count += $contributor->waiting_count;
+                               $locale_contributors['contributors'][ $contributor->user_id ]->fuzzy_count   += $contributor->fuzzy_count;
</ins><span class="cx" style="display: block; padding: 0 10px">                                 continue;
</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">-                        $user = get_user_by( 'id', $contributor_id );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $user = get_user_by( 'id', $contributor->user_id );
</ins><span class="cx" style="display: block; padding: 0 10px">                         if ( ! $user ) {
</span><span class="cx" style="display: block; padding: 0 10px">                                continue;
</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">-                        $locale_contributors['contributors'][ $contributor_id ] = (object) array(
-                               'nicename'     => $user->user_nicename,
-                               'display_name' => $this->_encode( $user->display_name ),
-                               'email'        => $user->user_email,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $locale_contributors['contributors'][ $contributor->user_id ] = (object) array(
+                               'nicename'      => $user->user_nicename,
+                               'display_name'  => $this->_encode( $user->display_name ),
+                               'email'         => $user->user_email,
+                               'last_update'   => $contributor->last_update,
+                               'total_count'   => $contributor->total_count,
+                               'current_count' => $contributor->current_count,
+                               'waiting_count' => $contributor->waiting_count,
+                               'fuzzy_count'   => $contributor->fuzzy_count,
</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">                unset( $contributors );
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                uasort( $locale_contributors['contributors'], array( $this, '_sort_contributors_by_total_count_callback' ) );
+
</ins><span class="cx" style="display: block; padding: 0 10px">                 return $locale_contributors;
</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">@@ -368,17 +386,24 @@
</span><span class="cx" style="display: block; padding: 0 10px">        private function get_locale_contributors_by_translation_set( $translation_set ) {
</span><span class="cx" style="display: block; padding: 0 10px">                global $wpdb;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $user_ids = $wpdb->get_col( $wpdb->prepare( "
-                       SELECT DISTINCT( `user_id` )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $contributors = $wpdb->get_results( $wpdb->prepare( "
+                       SELECT
+                               `user_id`,
+                               MAX( `date_added` ) AS `last_update`,
+                               COUNT( * ) as `total_count`,
+                               COUNT( CASE WHEN `status` = 'current' THEN `status` END ) AS `current_count`,
+                               COUNT( CASE WHEN `status` = 'waiting' THEN `status` END ) AS `waiting_count`,
+                               COUNT( CASE WHEN `status` = 'fuzzy' THEN `status` END ) AS `fuzzy_count`
</ins><span class="cx" style="display: block; padding: 0 10px">                         FROM `{$wpdb->gp_translations}`
</span><span class="cx" style="display: block; padding: 0 10px">                        WHERE
</span><span class="cx" style="display: block; padding: 0 10px">                                `translation_set_id` = %d
</span><span class="cx" style="display: block; padding: 0 10px">                                AND `user_id` IS NOT NULL AND `user_id` != 0
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                AND `status` <> 'rejected'
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         AND `status` IN( 'current', 'waiting', 'fuzzy' )
</ins><span class="cx" style="display: block; padding: 0 10px">                                 AND `date_modified` > %s
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                        GROUP BY `user_id`
</ins><span class="cx" style="display: block; padding: 0 10px">                 ", $translation_set->id, date( 'Y-m-d', time() - YEAR_IN_SECONDS ) ) );
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                return $user_ids;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         return $contributors;
</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">@@ -730,6 +755,10 @@
</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">+        private function _sort_contributors_by_total_count_callback( $a, $b ) {
+               return $a->total_count < $b->total_count;
+       }
+
</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">                // The Waiting project should always be first.
</span><span class="cx" style="display: block; padding: 0 10px">                if ( $a->slug == 'waiting' ) {
</span></span></pre>
</div>
</div>

</body>
</html>