Changeset 6691

Timestamp:

02/18/2018 05:24:48 PM (8 years ago)

Author:

ocean90

Message:

Translate: Include all types of translation editors in the editors list of a project.

Fixes #3461.

File:

• sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-gp-routes/inc/routes/class-locale.php (modified) (5 diffs)

sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-gp-routes/inc/routes/class-locale.php

@@ -358 +358 @@
 
         /**
-         * Retrieves contributors of a project.
+         * Retrieves translation editors of a project.
+         *
+         * Also includes cross-locale editors and editors of parent projects.
          *
          * @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 ) {
+         * @return array List of user IDs.
+         */
+        private function get_translation_editors( $project, $locale_slug ) {
                 global $wpdb;
 
-                $locale_contributors = array(
-                        'editors'      => array(),
-                        'contributors' => array(),
-                );
-
                 // Get the translation editors of the project.
-                $editors = $wpdb->get_col( $wpdb->prepare( "
+                $editors = (array) $wpdb->get_col( $wpdb->prepare( "
                         SELECT
                                 `user_id`
@@ -380 +376 @@
                         WHERE
                                 `project_id` = %d
-                                AND `locale` = %s
+                                AND `locale` IN (%s, 'all-locales')
                 ", $project->id, $locale_slug ) );
+
+                if ( $project->parent_project_id ) {
+                        $parent_project_id = $project->parent_project_id;
+                        $parent_project = GP::$project->get( $parent_project_id );
+                        while ( $parent_project_id ) {
+                                $editors = $editors + (array) $wpdb->get_col( $wpdb->prepare( "
+                                        SELECT
+                                                `user_id`
+                                        FROM {$wpdb->wporg_translation_editors}
+                                        WHERE
+                                                `project_id` = %d
+                                                AND `locale` IN (%s, 'all-locales')
+                                ", $parent_project->id, $locale_slug ) );
+
+                                $parent_project = GP::$project->get( $parent_project_id );
+                                $parent_project_id = $parent_project->parent_project_id;
+                        }
+                }
+
+                return $editors;
+        }
+
+        /**
+         * 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 = $this->get_translation_editors( $project, $locale_slug );
 
                 // Get the names of the translation editors.
@@ -468 +504 @@
                 unset( $contributors, $editors );
 
-                uasort( $locale_contributors['contributors'], array( $this, '_sort_contributors_by_total_count_callback' ) );
+                uasort( $locale_contributors['contributors'], function( $a, $b ) {
+                        return $a->total_count < $b->total_count;
+                } );
+
+                uasort( $locale_contributors['editors'], function( $a, $b ) {
+                        return strcasecmp( $a->display_name, $b->display_name );
+                } );
 
                 return $locale_contributors;
@@ -891 +933 @@
         }
 
-        private function _sort_contributors_by_total_count_callback( $a, $b ) {
-                return $a->total_count < $b->total_count;
-        }
-
         private function _sort_reverse_name_callback( $a, $b ) {
                 // The Waiting project should always be first.
@@ -903 +941 @@
         }
 
-        private function _sort_name_callback( $a, $b ) {
-                return strcasecmp( $a->name, $b->name );
-        }
-
         private function _encode( $raw ) {
                 $raw = mb_convert_encoding( $raw, 'UTF-8', 'ASCII, JIS, UTF-8, Windows-1252, ISO-8859-1' );