<!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>[4512] sites/trunk/wordpress.org/public_html/wp-content/plugins: Translate: Link locale to locale's project page and show editors in contributor stats table.</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/4512">4512</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/4512","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-12-11 22:10:26 +0000 (Sun, 11 Dec 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: Link locale to locale's project page and show editors in contributor stats table.
Fixes <a href="http://meta.trac.wordpress.org/ticket/1388">#1388</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginswporggpcustomizationstemplateslocaleprojectphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-gp-customizations/templates/locale-project.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginswporggpcustomizationstemplatesprojectswppluginscontributorsphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-gp-customizations/templates/projects-wp-plugins-contributors.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginswporggpcustomizationstemplatesstylecss">sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-gp-customizations/templates/style.css</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginswporggproutesincroutesclasslocalephp">sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-gp-routes/inc/routes/class-locale.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginswporggpcustomizationstemplateslocaleprojectphp"></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-customizations/templates/locale-project.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-customizations/templates/locale-project.php 2016-12-11 21:26:28 UTC (rev 4511)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-gp-customizations/templates/locale-project.php 2016-12-11 22:10:26 UTC (rev 4512)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -199,6 +199,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> printf(
</span><span class="cx" style="display: block; padding: 0 10px"> '<tr>
</span><span class="cx" style="display: block; padding: 0 10px"> <td class="contributor-name">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ %s
</ins><span class="cx" style="display: block; padding: 0 10px"> <a href="https://profiles.wordpress.org/%s/">%s %s</a>
</span><span class="cx" style="display: block; padding: 0 10px"> <span>Last Activity: %s ago</span>
</span><span class="cx" style="display: block; padding: 0 10px"> </td>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -221,6 +222,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px"> <td>
</span><span class="cx" style="display: block; padding: 0 10px"> </tr>',
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $contributor->is_editor ? '<span class="translation-editor">Editor</span>' : '',
</ins><span class="cx" style="display: block; padding: 0 10px"> $contributor->nicename,
</span><span class="cx" style="display: block; padding: 0 10px"> get_avatar( $contributor->email, 40 ),
</span><span class="cx" style="display: block; padding: 0 10px"> $contributor->display_name ? $contributor->display_name : $contributor->nicename,
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginswporggpcustomizationstemplatesprojectswppluginscontributorsphp"></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-customizations/templates/projects-wp-plugins-contributors.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-customizations/templates/projects-wp-plugins-contributors.php 2016-12-11 21:26:28 UTC (rev 4511)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-gp-customizations/templates/projects-wp-plugins-contributors.php 2016-12-11 22:10:26 UTC (rev 4512)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -93,13 +93,14 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> printf(
</span><span class="cx" style="display: block; padding: 0 10px"> '<div class="contributors-list-box%s">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <h4><span class="locale-name">%s<span> <span class="contributors-count">%s</span> <span class="locale-code">#%s</span></h4>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <h4><span class="locale-name">%s<span> <span class="contributors-count">%s</span> <a href="%s"><span class="locale-code">#%s</span></a></h4>
</ins><span class="cx" style="display: block; padding: 0 10px"> <p><strong>Editors:</strong> %s</p>
</span><span class="cx" style="display: block; padding: 0 10px"> <p><strong>Contributors:</strong> %s</p>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>',
</span><span class="cx" style="display: block; padding: 0 10px"> $has_editors ? ' has-editors' : ' no-editors',
</span><span class="cx" style="display: block; padding: 0 10px"> $locale->english_name,
</span><span class="cx" style="display: block; padding: 0 10px"> sprintf( _n( '%s person', '%s persons', $data['count'] ), number_format_i18n( $data['count'] ) ),
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ esc_url( gp_url_join( '/locale', $locale->slug, 'default', $project->path ) ),
</ins><span class="cx" style="display: block; padding: 0 10px"> $locale->wp_locale,
</span><span class="cx" style="display: block; padding: 0 10px"> wp_sprintf( '%l', $editors_list ),
</span><span class="cx" style="display: block; padding: 0 10px"> wp_sprintf( '%l', $contributor_list )
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginswporggpcustomizationstemplatesstylecss"></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-customizations/templates/style.css</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-customizations/templates/style.css 2016-12-11 21:26:28 UTC (rev 4511)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-gp-customizations/templates/style.css 2016-12-11 22:10:26 UTC (rev 4512)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1423,11 +1423,25 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> .locale-project-contributors-table .contributor-name {
</span><span class="cx" style="display: block; padding: 0 10px"> width: 40%;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ position: relative;
</ins><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-project-contributors-table .translation-editor {
+ position: absolute;
+ top: 37px;
+ left: 0;
+ width: 40px;
+ color: #fff;
+ font-weight: 200;
+ line-height: 16px;
+ text-align: center;
+ background-color: #826eb4;
+}
+
</ins><span class="cx" style="display: block; padding: 0 10px"> .locale-project-contributors-table .contributor-name span {
</span><span class="cx" style="display: block; padding: 0 10px"> font-size: 11px;
</span><span class="cx" style="display: block; padding: 0 10px"> display: block;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ margin-top: 13px;
</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-table tr {
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginswporggproutesincroutesclasslocalephp"></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/inc/routes/class-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/inc/routes/class-locale.php 2016-12-11 21:26:28 UTC (rev 4511)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-gp-routes/inc/routes/class-locale.php 2016-12-11 22:10:26 UTC (rev 4512)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -358,13 +358,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">+ $editors = array_keys( $locale_contributors['editors'] );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Get the names of the contributors.
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $contributors as $contributor ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( isset( $locale_contributors['editors'][ $contributor->user_id ] ) ) {
- continue;
- }
-
-
</del><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $locale_contributors['contributors'][ $contributor->user_id ] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // Update last updated and counts per status.
</span><span class="cx" style="display: block; padding: 0 10px"> $locale_contributors['contributors'][ $contributor->user_id ]->last_update = max(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -393,9 +390,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'current_count' => $contributor->current_count,
</span><span class="cx" style="display: block; padding: 0 10px"> 'waiting_count' => $contributor->waiting_count,
</span><span class="cx" style="display: block; padding: 0 10px"> 'fuzzy_count' => $contributor->fuzzy_count,
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'is_editor' => in_array( $user->ID, $editors ),
</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">- unset( $contributors );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ unset( $contributors, $editors );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> uasort( $locale_contributors['contributors'], array( $this, '_sort_contributors_by_total_count_callback' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre>
</div>
</div>
</body>
</html>