Changeset 1838

Timestamp:

08/19/2015 02:08:28 PM (9 years ago)

Author:

ocean90

Message:

WP i18n teams: Show all translation contributors and show Slack username of translation editors.

fixes #996.
fixes #1191.

Location:

sites/trunk/wordpress.org/public_html/wp-content/plugins/wp-i18n-teams

Files:

• css/i18n-teams.css (modified) (2 diffs)
• views/locale-details.php (modified) (2 diffs)
• wp-i18n-teams.php (modified) (3 diffs)

sites/trunk/wordpress.org/public_html/wp-content/plugins/wp-i18n-teams/css/i18n-teams.css

@@ -116 +116 @@
     float: left;
     width: 280px;       /* todo use flexbox to prog enhance this so that they fill the space. AF is good one to test */
-    padding-bottom: 15px;
+    margin-bottom: 15px;
     list-style-type: none;
 }
@@ -127 +127 @@
 }
 .validators a {
+    text-decoration: none;
+}
+.validators .user-name {
+    font-size: 16px;
+}
+.validators .user-slack {
     display: block;
-    margin: 6px 0 2px;
-    font-size: 16px;
-    text-decoration: none;
+    margin-top: .2em;
 }
 

sites/trunk/wordpress.org/public_html/wp-content/plugins/wp-i18n-teams/views/locale-details.php

@@ -61 +61 @@
 <?php else : ?>
     <ul class="validators">
-        <?php foreach ( $locale_data['validators'] as $validator ) : ?>
+        <?php foreach ( $locale_data['validators'] as $validator ) :
+            ?>
             <li>
-                <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>
+                <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/' );
+                }
+                ?>
             </li>
         <?php endforeach; ?>
@@ -77 +85 @@
 <?php if ( empty( $locale_data['translators'] ) ) : ?>
     <p><?php printf( __( '%s does not have any translators yet.', 'wporg' ), $locale->english_name ); ?></p>
-<?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>
+<?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>
 <?php endif; ?>
 

sites/trunk/wordpress.org/public_html/wp-content/plugins/wp-i18n-teams/wp-i18n-teams.php

@@ -210 +210 @@
         }
 
-        $contributors = self::get_contributors( $locale );
+        $contributors = $this->get_contributors( $locale );
         $locale_data['validators'] = $contributors['validators'];
         $locale_data['translators'] = $contributors['translators'];
 
         return $locale_data;
+    }
+
+    /**
+     * 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;
     }
 
@@ -249 +270 @@
 
     /**
-     * Get the translators and validators for the given locale.
+     * Get the translation editors for the given locale.
      *
      * @param GP_Locale $locale
      * @return array
      */
-    public static function get_contributors( $locale ) {
-        require_once( API_WPORGPATH . 'core/credits/wp-credits.php' );
-
-        $credits = WP_Credits::factory( WP_CORE_LATEST_RELEASE, $locale );
-        $results = $credits->get_results();
-
-        $contributors = array(
-            'validators'  => ! empty( $results['groups']['validators']['data'] )  ? $results['groups']['validators']['data']  : array(),
-            'translators' => ! empty( $results['groups']['translators']['data'] ) ? $results['groups']['translators']['data'] : array(),
-        );
+    private function get_translation_editors( $locale ) {
+        global $wpdb;
+
+        $editors = array();
+
+        $subdomain = $wpdb->get_var( $wpdb->prepare( "SELECT subdomain FROM locales WHERE locale = %s", $locale->wp_locale ) );
+        if ( ! $subdomain ) {
+            return $editors;
+        }
+
+        $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' ) );
 
         return $contributors;
@@ -318 +410 @@
         }
     }
+
+    /**
+     * 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'] );
+    }
 }