Changeset 2200

Timestamp:

12/17/2015 05:20:22 PM (10 years ago)

Author:

ocean90

Message:

WP i18n teams: Separate global and project specific editors on language team pages.

Fixes #1234.

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) (3 diffs)
• wp-i18n-teams.php (modified) (5 diffs)

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

@@ -113 +113 @@
     padding: 0;
 }
+
+ul.validators {
+    display: -webkit-box;
+    display: -webkit-flex;
+    display: -ms-flexbox;
+    display: flex;
+    -webkit-flex-flow: row wrap;
+    -ms-flex-flow: row wrap;
+    flex-flow: row wrap;
+}
+
 .validators li {
-    float: left;
-    width: 280px;       /* todo use flexbox to prog enhance this so that they fill the space. AF is good one to test */
+    list-style-type: none;
     margin-bottom: 15px;
-    list-style-type: none;
+    width: 33%;
 }
-.validators .gravatar {
-    position: relative;
-    top: -6px;
-    float: left;
-    margin: 0 10px 10px 0;
-    padding: 2px;
+
+.validators.project-validators li {
+    width: 25%;
+    margin-bottom: 5px;
+}
+
+@media only screen and (max-width: 850px) {
+    .validators li {
+        width: 50%;
+    }
+
+    .validators.project-validators li {
+        width: 33%;
+    }
+}
+
+@media only screen and (max-width: 470px) {
+    .validators li {
+        width: 100%;
+    }
+    .validators.project-validators li {
+        width: 50%;
+    }
+}
+
+.validators.project-validators img.avatar {
+    margin-right: 5px !important;
 }
 .validators a {
@@ -131 +162 @@
 .validators .user-name {
     font-size: 16px;
+    position: relative;
+    top: .2em;
 }
+.validators.project-validators .user-name {
+    font-size: 13px;
+}
+
 .validators .user-slack {
     display: block;

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

@@ -55 +55 @@
 
 
-<h2><?php _e( 'Translation Editors', 'wporg' ); ?></h2>
+<h2><?php _e( 'General Translation Editors', 'wporg' ); ?></h2>
 
 <?php if ( empty( $locale_data['validators'] ) ) : ?>
@@ -65 +65 @@
             <li>
                 <a class="user-avatar" href="https://profiles.wordpress.org/<?php echo esc_attr( $validator['nice_name'] ); ?>"><?php
-                    echo get_avatar( $validator['email'], 60 );
+                    echo get_avatar( $validator['email'], 50 );
                 ?></a>
                 <a class="user-name" href="https://profiles.wordpress.org/<?php echo esc_attr( $validator['nice_name'] ); ?>"><?php
@@ -75 +75 @@
                 }
                 ?>
+            </li>
+        <?php endforeach; ?>
+    </ul>
+<?php endif; ?>
+
+
+<?php if ( ! empty( $locale_data['project_validators'] ) ) : ?>
+    <h2><?php _e( 'Project Translation Editors', 'wporg' ); ?></h2>
+
+    <ul class="validators project-validators">
+        <?php foreach ( $locale_data['project_validators'] as $validator ) :
+            ?>
+            <li>
+                <a class="user-avatar" href="https://profiles.wordpress.org/<?php echo esc_attr( $validator['nice_name'] ); ?>"><?php
+                    echo get_avatar( $validator['email'], 25 );
+                ?></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>
             </li>
         <?php endforeach; ?>

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

@@ -28 +28 @@
     public function enqueue_assets() {
         if ( is_singular() && false !== strpos( get_post()->post_content, '[wp-locales' ) ) {
-            wp_enqueue_style( 'wp-i18n-teams', plugins_url( 'css/i18n-teams.css', __FILE__ ), array(), 2 );
+            wp_enqueue_style( 'wp-i18n-teams', plugins_url( 'css/i18n-teams.css', __FILE__ ), array(), 3 );
             wp_enqueue_script( 'wp-i18n-teams', plugins_url( 'js/i18n-teams.js', __FILE__ ), array( 'jquery' ), 2 );
         }
@@ -212 +212 @@
         $contributors = $this->get_contributors( $locale );
         $locale_data['validators'] = $contributors['validators'];
+        $locale_data['project_validators'] = $contributors['project_validators'];
         $locale_data['translators'] = $contributors['translators'];
 
@@ -230 +231 @@
 
         $contributors = array();
-        $contributors['validators'] = $this->get_translation_editors( $locale );
+        $contributors['validators'] = $this->get_general_translation_editors( $locale );
+        $contributors['project_validators'] = $this->get_project_translation_editors( $locale );
         $contributors['translators'] = $this->get_translation_contributors( $locale );
 
@@ -270 +272 @@
 
     /**
-     * Get the translation editors for the given locale.
+     * Get the general translation editors for the given locale.
      *
      * @param GP_Locale $locale
      * @return array
      */
-    private function get_translation_editors( $locale ) {
+    private function get_general_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%'" );
+        $users = $wpdb->get_col( $wpdb->prepare( "
+            SELECT `user_id` FROM `translate_translation_editors`
+            WHERE `project_id` = '0' AND `locale` = %s
+        ", $locale->slug ) );
+
         if ( ! $users ) {
             return $editors;
@@ -311 +306 @@
                     'nice_name'    => $user->user_nicename,
                     'slack'        => self::get_slack_username( $user->ID ),
+                );
+            }
+        }
+
+        uasort( $editors, array( $this, '_sort_display_name_callback' ) );
+
+        return $editors;
+    }
+
+    /**
+     * Get the general translation editors for the given locale.
+     *
+     * @param GP_Locale $locale
+     * @return array
+     */
+    private function get_project_translation_editors( $locale ) {
+        global $wpdb;
+
+        $editors = array();
+
+        $users = $wpdb->get_col( $wpdb->prepare( "
+            SELECT `user_id` FROM `translate_translation_editors`
+            WHERE `project_id` <> '0' AND `locale` = %s
+        ", $locale->slug ) );
+
+        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,
+                );
+            } else {
+                $editors[ $user->user_nicename ] = array(
+                    'display_name' => $user->user_nicename,
+                    'email'        => $user->user_email,
+                    'nice_name'    => $user->user_nicename,
                 );
             }