<!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>[1838] sites/trunk/wordpress.org/public_html/wp-content/plugins/wp-i18n-teams: WP i18n teams: Show all translation contributors and show Slack username of translation editors.</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/1838">1838</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/1838","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-08-19 14:08:28 +0000 (Wed, 19 Aug 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'>WP i18n teams: Show all translation contributors and show Slack username of translation editors.
fixes <a href="http://meta.trac.wordpress.org/ticket/996">#996</a>.
fixes <a href="http://meta.trac.wordpress.org/ticket/1191">#1191</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginswpi18nteamscssi18nteamscss">sites/trunk/wordpress.org/public_html/wp-content/plugins/wp-i18n-teams/css/i18n-teams.css</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginswpi18nteamsviewslocaledetailsphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/wp-i18n-teams/views/locale-details.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginswpi18nteamswpi18nteamsphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/wp-i18n-teams/wp-i18n-teams.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginswpi18nteamscssi18nteamscss"></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/wp-i18n-teams/css/i18n-teams.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/wp-i18n-teams/css/i18n-teams.css 2015-08-19 04:48:07 UTC (rev 1837)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/wp-i18n-teams/css/i18n-teams.css 2015-08-19 14:08:28 UTC (rev 1838)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -115,7 +115,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> .validators li {
</span><span class="cx" style="display: block; padding: 0 10px"> float: left;
</span><span class="cx" style="display: block; padding: 0 10px"> width: 280px; /* todo use flexbox to prog enhance this so that they fill the space. AF is good one to test */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- padding-bottom: 15px;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ margin-bottom: 15px;
</ins><span class="cx" style="display: block; padding: 0 10px"> list-style-type: none;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> .validators .gravatar {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -126,11 +126,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> padding: 2px;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> .validators a {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- display: block;
- margin: 6px 0 2px;
- font-size: 16px;
</del><span class="cx" style="display: block; padding: 0 10px"> text-decoration: none;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.validators .user-name {
+ font-size: 16px;
+}
+.validators .user-slack {
+ display: block;
+ margin-top: .2em;
+}
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> .translators-info table {
</span><span class="cx" style="display: block; padding: 0 10px"> width: 100%;
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginswpi18nteamsviewslocaledetailsphp"></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/wp-i18n-teams/views/locale-details.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/wp-i18n-teams/views/locale-details.php 2015-08-19 04:48:07 UTC (rev 1837)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/wp-i18n-teams/views/locale-details.php 2015-08-19 14:08:28 UTC (rev 1838)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -60,12 +60,20 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <p><?php printf( __( '%s does not have any validators yet.', 'wporg' ), $locale->english_name ); ?></p>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php else : ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <ul class="validators">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php foreach ( $locale_data['validators'] as $validator ) : ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php foreach ( $locale_data['validators'] as $validator ) :
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <li>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <a href="https://profiles.wordpress.org/<?php echo esc_attr( $validator[2] ); ?>">
- <img src="https://secure.gravatar.com/avatar/<?php echo esc_attr( $validator[1] ); ?>?size=60" class="gravatar" alt="<?php echo esc_attr( $validator[0] ); ?>" />
- <?php echo esc_html( $validator[0] ); ?>
- </a>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <a class="user-avatar" href="https://profiles.wordpress.org/<?php echo esc_attr( $validator['nice_name'] ); ?>"><?php
+ echo get_avatar( $validator['email'], 60 );
+ ?></a>
+ <a class="user-name" href="https://profiles.wordpress.org/<?php echo esc_attr( $validator['nice_name'] ); ?>"><?php
+ echo esc_html( $validator['display_name'] );
+ ?></a>
+ <?php
+ if ( $validator['slack'] ) {
+ printf( '<span class="user-slack">@%s on <a href="%s">Slack</a></span>', $validator['slack'], 'https://make.wordpress.org/chat/' );
+ }
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </li>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endforeach; ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </ul>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -76,16 +84,20 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( empty( $locale_data['translators'] ) ) : ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <p><?php printf( __( '%s does not have any translators yet.', 'wporg' ), $locale->english_name ); ?></p>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php else : ?>
- <ul>
- <?php foreach ( $locale_data['translators'] as $username => $name ) : ?>
- <li>
- <a href="https://profiles.wordpress.org/<?php echo esc_attr( $username ); ?>">
- <?php echo esc_html( $name ); ?>
- </a>
- </li>
- <?php endforeach; ?>
- </ul>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php else :?>
+ <p>
+ <?php
+ $translators = array();
+ foreach ( $locale_data['translators'] as $translator ) {
+ $translators[] = sprintf(
+ '<a href="https://profiles.wordpress.org/%s">%s</a>',
+ esc_attr( $translator['nice_name'] ),
+ esc_html( $translator['display_name'] )
+ );
+ }
+ echo wp_sprintf( '%l.', $translators );
+ ?>
+ </p>
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <p class="alert alert-info" role="alert">
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginswpi18nteamswpi18nteamsphp"></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/wp-i18n-teams/wp-i18n-teams.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/wp-i18n-teams/wp-i18n-teams.php 2015-08-19 04:48:07 UTC (rev 1837)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/wp-i18n-teams/wp-i18n-teams.php 2015-08-19 14:08:28 UTC (rev 1838)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -209,13 +209,34 @@
</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">- $contributors = self::get_contributors( $locale );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $contributors = $this->get_contributors( $locale );
</ins><span class="cx" style="display: block; padding: 0 10px"> $locale_data['validators'] = $contributors['validators'];
</span><span class="cx" style="display: block; padding: 0 10px"> $locale_data['translators'] = $contributors['translators'];
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return $locale_data;
</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">+ /**
+ * Get the translators and validators for the given locale.
+ *
+ * @param GP_Locale $locale
+ * @return array
+ */
+ public function get_contributors( $locale ) {
+ $cache = wp_cache_get( 'contributors-data:' . $locale->wp_locale, 'wp-i18n-teams' );
+ if ( false !== $cache ) {
+ return $cache;
+ }
+
+ $contributors = array();
+ $contributors['validators'] = $this->get_translation_editors( $locale );
+ $contributors['translators'] = $this->get_translation_contributors( $locale );
+
+ wp_cache_set( 'contributors-data:' . $locale->wp_locale, $contributors, 'wp-i18n-teams', 2 * HOUR_IN_SECONDS );
+
+ return $contributors;
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> public function get_core_translation_data() {
</span><span class="cx" style="display: block; padding: 0 10px"> $cache = get_transient( 'core_translation_data' );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( false !== $cache ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -248,22 +269,93 @@
</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">- * Get the translators and validators for the given locale.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Get the translation editors for the given locale.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param GP_Locale $locale
</span><span class="cx" style="display: block; padding: 0 10px"> * @return array
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- public static function get_contributors( $locale ) {
- require_once( API_WPORGPATH . 'core/credits/wp-credits.php' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ private function get_translation_editors( $locale ) {
+ global $wpdb;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $credits = WP_Credits::factory( WP_CORE_LATEST_RELEASE, $locale );
- $results = $credits->get_results();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $editors = array();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $contributors = array(
- 'validators' => ! empty( $results['groups']['validators']['data'] ) ? $results['groups']['validators']['data'] : array(),
- 'translators' => ! empty( $results['groups']['translators']['data'] ) ? $results['groups']['translators']['data'] : array(),
- );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $subdomain = $wpdb->get_var( $wpdb->prepare( "SELECT subdomain FROM locales WHERE locale = %s", $locale->wp_locale ) );
+ if ( ! $subdomain ) {
+ return $editors;
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $blog_id = $wpdb->get_var( $wpdb->prepare( "SELECT blog_id FROM $wpdb->blogs WHERE domain = %s AND path = '/'", "$subdomain.wordpress.org" ) );
+ if ( ! $blog_id ) {
+ return $editors;
+ }
+
+ $meta_key = $wpdb->base_prefix . intval( $blog_id ) . '_capabilities';
+ $users = $wpdb->get_col( "SELECT user_id FROM $wpdb->usermeta WHERE meta_key = '$meta_key' AND meta_value LIKE '%translation_editor%'" );
+ if ( ! $users ) {
+ return $editors;
+ }
+
+ $user_data = $wpdb->get_results( "SELECT ID, user_nicename, display_name, user_email FROM $wpdb->users WHERE ID IN (" . implode( ',', $users ) . ")" );
+ foreach ( $user_data as $user ) {
+ if ( $user->display_name && $user->display_name !== $user->user_nicename ) {
+ $editors[ $user->user_nicename ] = array(
+ 'display_name' => $user->display_name,
+ 'email' => $user->user_email,
+ 'nice_name' => $user->user_nicename,
+ 'slack' => self::get_slack_username( $user->ID ),
+ );
+ } else {
+ $editors[ $user->user_nicename ] = array(
+ 'display_name' => $user->user_nicename,
+ 'email' => $user->user_email,
+ 'nice_name' => $user->user_nicename,
+ 'slack' => self::get_slack_username( $user->ID ),
+ );
+ }
+ }
+
+ uasort( $editors, array( $this, '_sort_display_name_callback' ) );
+
+ return $editors;
+ }
+
+ /**
+ * Get the translation contributors for the given locale.
+ *
+ * @param GP_Locale $locale
+ * @return array
+ */
+ private function get_translation_contributors( $locale ) {
+ global $wpdb;
+
+ $contributors = array();
+
+ $users = $wpdb->get_col( $wpdb->prepare(
+ "SELECT DISTINCT user_id FROM translate_user_translations_count WHERE accepted > 0 AND locale = %s",
+ $locale->slug
+ ) );
+
+ if ( ! $users ) {
+ $contributors;
+ }
+
+ $user_data = $wpdb->get_results( "SELECT user_nicename, display_name, user_email FROM $wpdb->users WHERE ID IN (" . implode( ',', $users ) . ")" );
+ foreach ( $user_data as $user ) {
+ if ( $user->display_name && $user->display_name !== $user->user_nicename ) {
+ $contributors[ $user->user_nicename ] = array(
+ 'display_name' => $user->display_name,
+ 'nice_name' => $user->user_nicename,
+ );
+ } else {
+ $contributors[ $user->user_nicename ] = array(
+ 'display_name' => $user->user_nicename,
+ 'nice_name' => $user->user_nicename,
+ );
+ }
+ }
+
+ uasort( $contributors, array( $this, '_sort_display_name_callback' ) );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> return $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">@@ -317,6 +409,28 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return 'translated-50-less';
</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">+
+ /**
+ * Get the Slack username for a .org user.
+ *
+ * @param int $user_id
+ *
+ * @return string
+ */
+ protected static function get_slack_username( $user_id ) {
+ global $wpdb;
+
+ $data = $wpdb->get_var( $wpdb->prepare( "SELECT profiledata FROM slack_users WHERE user_id = %d", $user_id ) );
+ if ( $data && ( $data = json_decode( $data, true ) ) ) {
+ return $data['name'];
+ }
+
+ return '';
+ }
+
+ public function _sort_display_name_callback( $a, $b ) {
+ return strnatcasecmp( $a['display_name'], $b['display_name'] );
+ }
</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"> $GLOBALS['wp_i18n_teams'] = new WP_I18n_Teams();
</span></span></pre>
</div>
</div>
</body>
</html>