<!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>[2663] sites/trunk: Translate: Display contributors and editors 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/2663">2663</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/2663","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-01 22:46:06 +0000 (Tue, 01 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: Display contributors and editors 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>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginswporggproutesrouteswppluginsphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-gp-routes/routes/wp-plugins.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-01 20:30:09 UTC (rev 2662)
+++ sites/trunk/translate.wordpress.org/public_html/gp-templates-new/locale-project.php 2016-03-01 22:46:06 UTC (rev 2663)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -178,6 +178,47 @@
</span><span class="cx" style="display: block; padding: 0 10px">        </table>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<div class="locale-project-contributors">
+       <div class="locale-project-contributors-group locale-project-contributors-contributors">
+               <h3>Translation Contributors</h3>
+               <?php if ( $locale_contributors['contributors'] ) : ?>
+               <ul>
+                       <?php
+                       foreach ( $locale_contributors['contributors'] as $contributor ) {
+                               printf(
+                                       '<li><a href="https://profiles.wordpress.org/%s/">%s %s</a></li>',
+                                       $contributor->nicename,
+                                       get_avatar( $contributor->email, 30 ),
+                                       $contributor->display_name ? $contributor->display_name : $contributor->nicename
+                               );
+                       }
+                       ?>
+               </ul>
+               <?php else : ?>
+                       <p>None, be the first?</p>
+               <?php endif; ?>
+       </div>
+       <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>
+</div>
+
</ins><span class="cx" style="display: block; padding: 0 10px"> <script>
</span><span class="cx" style="display: block; padding: 0 10px">        jQuery( document ).ready( function( $ ) {
</span><span class="cx" style="display: block; padding: 0 10px">                $( '#variant-selector' ).on( 'change', function( event ) {
</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-01 20:30:09 UTC (rev 2662)
+++ sites/trunk/translate.wordpress.org/public_html/gp-templates-new/style.css  2016-03-01 22:46:06 UTC (rev 2663)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -343,6 +343,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> .project-box-header:after,
</span><span class="cx" style="display: block; padding: 0 10px"> .project-status:before,
</span><span class="cx" style="display: block; padding: 0 10px"> .project-status:after,
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.locale-project-contributors:before,
+.locale-project-contributors:after,
</ins><span class="cx" style="display: block; padding: 0 10px"> .locales:before,
</span><span class="cx" style="display: block; padding: 0 10px"> .locales:after {
</span><span class="cx" style="display: block; padding: 0 10px">        content: "";
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -354,6 +356,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> .projects:after,
</span><span class="cx" style="display: block; padding: 0 10px"> .project-box-header:after,
</span><span class="cx" style="display: block; padding: 0 10px"> .project-status:after,
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.locale-project-contributors:after,
</ins><span class="cx" style="display: block; padding: 0 10px"> .locales:after {
</span><span class="cx" style="display: block; padding: 0 10px">        clear: both;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1278,3 +1281,23 @@
</span><span class="cx" style="display: block; padding: 0 10px"> .contributors-list[data-current-filter="no-editors"] .has-editors {
</span><span class="cx" style="display: block; padding: 0 10px">        display: none !important;
</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-group {
+       width: 50%;
+       float: left;
+}
+
+.locale-project-contributors-group ul {
+       padding: 0;
+       margin: 0;
+       list-style: none;
+}
+
+.locale-project-contributors-group li {
+       margin: 0 0 10px;
+}
+
+.locale-project-contributors-group li img {
+       vertical-align: middle;
+       margin-right: 10px;
+}
</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-01 20:30:09 UTC (rev 2662)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-gp-routes/routes/locale.php  2016-03-01 22:46:06 UTC (rev 2663)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -167,6 +167,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">                        $variants = $this->get_locale_variants( $locale_slug, array( $sub_project->id ) );
</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">+                $locale_contributors = $this->get_locale_contributors( $sub_project, $locale_slug, $set_slug );
+
</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->tmpl( 'locale-project', get_defined_vars() );
</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">@@ -260,6 +262,126 @@
</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 contributors of a project.
+        *
+        * @param GP_Project $project     A GlotPress project.
+        * @param string     $locale_slug Slug of the locale.
+        * @param string     $set_slug    Slug of the translation set.
+        * @return array Contributors.
+        */
+       private function get_locale_contributors( $project, $locale_slug, $set_slug ) {
+               global $wpdb;
+
+               $locale_contributors = array(
+                       'editors'      => array(),
+                       'contributors' => array(),
+               );
+
+               // Get the translation editors of the project.
+               $editors = $wpdb->get_col( $wpdb->prepare( "
+                       SELECT
+                               `user_id`
+                       FROM {$wpdb->wporg_translation_editors}
+                       WHERE
+                               `project_id` = %d
+                               AND `locale` = %s
+               ", $project->id, $locale_slug ) );
+
+               // Get the names of the translation editors.
+               foreach ( $editors as $editor_id ) {
+                       $user = get_user_by( 'id', $editor_id );
+                       if ( ! $user ) {
+                               continue;
+                       }
+
+                       $locale_contributors['editors'][ $editor_id ] = (object) array(
+                               'nicename'     => $user->user_nicename,
+                               'display_name' => $this->_encode( $user->display_name ),
+                               'email'        => $user->user_email,
+                       );
+               }
+               unset( $editors );
+
+               // Get the contributors of the project.
+               $contributors = array();
+
+               // In case the project has a translation set, like /wp-themes/twentysixteen.
+               $translation_set = GP::$translation_set->by_project_id_slug_and_locale( $project->id, $set_slug, $locale_slug );
+               if ( $translation_set ) {
+                       $contributors = array_merge(
+                               $contributors,
+                               $this->get_locale_contributors_by_translation_set( $translation_set )
+                       );
+               }
+
+               // Check if the project has sub-projects, like /wp-plugins/wordpress-importer.
+               $sub_projects = $wpdb->get_col( $wpdb->prepare( "
+                       SELECT id
+                       FROM {$wpdb->gp_projects}
+                       WHERE parent_project_id = %d
+               ", $project->id ) );
+
+               foreach ( $sub_projects as $sub_project ) {
+                       $translation_set = GP::$translation_set->by_project_id_slug_and_locale( $sub_project, $set_slug, $locale_slug );
+                       if ( ! $translation_set ) {
+                               continue;
+                       }
+
+                       $contributors = array_merge(
+                               $contributors,
+                               $this->get_locale_contributors_by_translation_set( $translation_set )
+                       );
+               }
+
+               // Get the names of the contributors.
+               foreach ( $contributors as $contributor_id ) {
+                       if ( isset( $locale_contributors['editors'][ $contributor_id ] ) ) {
+                               continue;
+                       }
+
+                       if ( isset( $locale_contributors['contributors'][ $contributor_id ] ) ) {
+                               continue;
+                       }
+
+                       $user = get_user_by( 'id', $contributor_id );
+                       if ( ! $user ) {
+                               continue;
+                       }
+
+                       $locale_contributors['contributors'][ $contributor_id ] = (object) array(
+                               'nicename'     => $user->user_nicename,
+                               'display_name' => $this->_encode( $user->display_name ),
+                               'email'        => $user->user_email,
+                       );
+               }
+               unset( $contributors );
+
+               return $locale_contributors;
+       }
+
+       /**
+        * Retrieves contributors of a translation set.
+        *
+        * @param GP_Translation_Set $translation_set A translation set.
+        * @return array List of user IDs.
+        */
+       private function get_locale_contributors_by_translation_set( $translation_set ) {
+               global $wpdb;
+
+               $user_ids = $wpdb->get_col( $wpdb->prepare( "
+                       SELECT DISTINCT( `user_id` )
+                       FROM `{$wpdb->gp_translations}`
+                       WHERE
+                               `translation_set_id` = %d
+                               AND `user_id` IS NOT NULL AND `user_id` != 0
+                               AND `status` <> 'rejected'
+                               AND `date_modified` > %s
+               ", $translation_set->id, date( 'Y-m-d', time() - YEAR_IN_SECONDS ) ) );
+
+               return $user_ids;
+       }
+
+       /**
</ins><span class="cx" style="display: block; padding: 0 10px">          * Calculates the status of a project.
</span><span class="cx" style="display: block; padding: 0 10px">         *
</span><span class="cx" style="display: block; padding: 0 10px">         * @param GP_Project $project           The GlotPress project.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -619,4 +741,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">        private function _sort_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><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+       private function _encode( $raw ) {
+               $raw = mb_convert_encoding( $raw, 'UTF-8', 'ASCII, JIS, UTF-8, Windows-1252, ISO-8859-1' );
+               return ent2ncr( htmlspecialchars_decode( htmlentities( $raw, ENT_NOQUOTES, 'UTF-8' ), ENT_NOQUOTES ) );
+       }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span></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/wordpress.org/public_html/wp-content/plugins/wporg-gp-routes/routes/wp-plugins.php    2016-03-01 20:30:09 UTC (rev 2662)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-gp-routes/routes/wp-plugins.php      2016-03-01 22:46:06 UTC (rev 2663)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -263,7 +263,6 @@
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><span class="cx" style="display: block; padding: 0 10px">                 $labels = array_keys( $data );
</span><span class="cx" style="display: block; padding: 0 10px">                array_pop( $labels );
</span><span class="cx" style="display: block; padding: 0 10px">                $labels[] = ''; // Don't show a label for today
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -311,7 +310,6 @@
</span><span class="cx" style="display: block; padding: 0 10px">                $json = file_get_contents( "https://api.wordpress.org/translations/plugins/1.0/?slug={$project_slug}", null, $http_context );
</span><span class="cx" style="display: block; padding: 0 10px">                $language_packs = $json && '{' == $json[0] ? json_decode( $json ) : null;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><span class="cx" style="display: block; padding: 0 10px">                 $this->tmpl( 'projects-wp-plugins-language-packs', get_defined_vars() );
</span><span class="cx" style="display: block; padding: 0 10px">        }
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span></span></pre>
</div>
</div>

</body>
</html>