Changeset 2864

Timestamp:

03/31/2016 08:25:15 PM (10 years ago)

Author:

ocean90

Message:

Translate: Display stats, contributors and language packs on theme project pages.

See #1388.

Location:

sites/trunk

Files:

• translate.wordpress.org/public_html/gp-templates-new/projects-wp-plugins.php (modified) (1 diff)
• translate.wordpress.org/public_html/gp-templates-new/projects-wp-themes-contributors.php (copied) (copied from sites/trunk/translate.wordpress.org/public_html/gp-templates-new/projects-wp-plugins-contributors.php ) (1 diff)
• translate.wordpress.org/public_html/gp-templates-new/projects-wp-themes-language-packs.php (copied) (copied from sites/trunk/translate.wordpress.org/public_html/gp-templates-new/projects-wp-plugins-language-packs.php ) (1 diff)
• translate.wordpress.org/public_html/gp-templates-new/projects-wp-themes.php (copied) (copied from sites/trunk/translate.wordpress.org/public_html/gp-templates-new/projects-wp-plugins.php ) (4 diffs)
• translate.wordpress.org/public_html/gp-templates-new/stats-overview.php (modified) (1 diff)
• translate.wordpress.org/public_html/gp-templates-new/style.css (modified) (3 diffs)
• wordpress.org/public_html/wp-content/plugins/wporg-gp-routes/routes/wp-directory.php (copied) (copied from sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-gp-routes/routes/wp-plugins.php ) (7 diffs)
• wordpress.org/public_html/wp-content/plugins/wporg-gp-routes/routes/wp-plugins.php (modified) (5 diffs)
• wordpress.org/public_html/wp-content/plugins/wporg-gp-routes/routes/wp-themes.php (copied) (copied from sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-gp-routes/routes/wp-plugins.php ) (12 diffs)
• wordpress.org/public_html/wp-content/plugins/wporg-gp-routes/wporg-gp-routes.php (modified) (4 diffs)

sites/trunk/translate.wordpress.org/public_html/gp-templates-new/projects-wp-plugins.php

@@ -56 +56 @@
                 <thead>
                         <tr>
-                                <?php foreach ( $table_headings as $heading ) : ?>
-                                <th class="title"><?php echo $heading; ?></th>
+                                <?php foreach ( $table_headings as $key => $heading ) : ?>
+                                <th class="col-<?php echo $key; ?>"><?php echo $heading; ?></th>
                                 <?php endforeach; ?>
                         </tr>

sites/trunk/translate.wordpress.org/public_html/gp-templates-new/projects-wp-themes-contributors.php

@@ -49 +49 @@
 
         <h3>Teams</h3>
-        <p>For each locale a plugin can have translation editors and contributors. If a locale has no editor yet then you should probably <a href="https://make.wordpress.org/polyglots/handbook/rosetta/theme-plugin-directories/#translating-themes-plugins">make a request</a>.</p>
+        <p>For each locale a theme can have translation editors and contributors. If a locale has no editor yet then you should probably <a href="https://make.wordpress.org/polyglots/handbook/rosetta/theme-plugin-directories/#translating-themes-plugins">make a request</a>.</p>
         <?php
         if ( $contributors_by_locale ) {

sites/trunk/translate.wordpress.org/public_html/gp-templates-new/projects-wp-themes-language-packs.php

@@ -43 +43 @@
         <h3>Language Packs</h3>
 
-        <p>Language packs are installed automatically if they are available. Once a locale has reached the threshold for a package build it will be listed here. It also means that you don&#8217;t have to include this language in your plugin anymore.</p>
+        <p>Language packs are installed automatically if they are available. Once a locale has reached the threshold for a package build it will be listed here. It also means that you don&#8217;t have to include this language in your theme anymore.</p>
 
         <?php

sites/trunk/translate.wordpress.org/public_html/gp-templates-new/projects-wp-themes.php

@@ -3 +3 @@
 $table_headings = array(
         'locale'        => __( 'Locale' ),
-        'dev'           => __( 'Development' ),
-        'dev-readme'    => __( 'Development Readme' ),
         'stable'        => __( 'Stable' ),
-        'stable-readme' => __( 'Stable Readme' ),
         'waiting'       => __( 'Waiting' ),
 );
@@ -46 +43 @@
 </div>
 
-<?php if ( $has_error ) : ?>
-<div class="wporg-notice wporg-notice-warning">
-        <p>This plugin is not <a href="https://developer.wordpress.org/plugins/internationalization/how-to-internationalize-your-plugin/">properly prepared for localization</a>. If you would like to translate this plugin, <a href="<?php echo esc_url( 'https://wordpress.org/support/plugin/' . $project->slug ); ?>">please contact the author</a>.</p>
-</div>
-<?php endif; ?>
-
 <div class="stats-table">
         <table id="stats-table" class="table">
                 <thead>
                         <tr>
-                                <?php foreach ( $table_headings as $heading ) : ?>
-                                <th class="title"><?php echo $heading; ?></th>
+                                <?php foreach ( $table_headings as $key => $heading ) : ?>
+                                <th class="col-<?php echo $key; ?>"><?php echo $heading; ?></th>
                                 <?php endforeach; ?>
                         </tr>
@@ -88 +79 @@
                                         <?php
                                                 if ( $translation_locale_statuses[ $locale_slug ] ) :
-                                                        foreach ( array( 'dev', 'dev-readme', 'stable', 'stable-readme', 'waiting' ) as $subproject_slug ) :
+                                                        foreach ( array( 'stable', 'waiting' ) as $subproject_slug ) :
                                                                 if ( isset( $translation_locale_statuses[ $locale_slug ][ $subproject_slug ] ) ) :
                                                                         $percent = $translation_locale_statuses[ $locale_slug ][ $subproject_slug ];
@@ -105 +96 @@
                                                                         else :
                                                                                 $percent_class = (int) ( $percent / 10 ) * 10;
-                                                                                $link_url  = gp_url_project( $project->path, gp_url_join( $subproject_slug, $gp_locale->slug, $set_slug ) );
+                                                                                $link_url  = gp_url_project( $project->path, gp_url_join( $gp_locale->slug, $set_slug ) );
                                                                                 $link_text = "$percent%";
 

sites/trunk/translate.wordpress.org/public_html/gp-templates-new/stats-overview.php

@@ -14 +14 @@
                 <thead>
                         <tr>
-                                <th class="title"><?php _e( 'Locale' ); ?></th>
+                                <th class="col-locale-code"><?php _e( 'Locale' ); ?></th>
                                 <?php foreach ( $projects as $slug => $project ) : ?>
                                         <th><?php

sites/trunk/translate.wordpress.org/public_html/gp-templates-new/style.css

@@ -949 +949 @@
         text-align: center;
         border-collapse: collapse;
+        table-layout: fixed;
 }
 
@@ -962 +963 @@
         text-align: center;
         vertical-align: bottom;
-        width: 79px;
         padding: 10px 3px;
         font-size: .8em;
@@ -974 +974 @@
 }
 
-.stats-table table th.title {
-        width: 140px!important;
+.stats-table table th {
+        word-break: break-word;
+}
+
+.stats-table table th.col-locale-code {
+        width: 110px;
+}
+
+.stats-table table th.col-locale {
+        width: 180px;
 }
 

sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-gp-routes/routes/wp-directory.php

@@ -1 +1 @@
 <?php
 
-class WPorg_GP_Route_WP_Plugins extends GP_Route {
-
-        /**
-         * Prints stats about sub-project of a specific project.
-         *
-         * @param string $project_slug Slug of a project.
-         */
-        public function get_plugin_projects( $project_slug ) {
+class WPorg_GP_Route_WP_Directory extends GP_Route {
+
+        /**
+         * Prints stats about contributors of a specific project.
+         *
+         * @param GP_Project $project The project.
+         * @return array|false False if project not found, otherwise array with contributors.
+         */
+        public function get_contributors( $project ) {
                 global $wpdb;
-
-                $project_path = 'wp-plugins/' . $project_slug;
-                $project = GP::$project->by_path( $project_path );
-                if ( ! $project ) {
-                        return $this->die_with_404();
-                }
-
-                $rows = $wpdb->get_results( "
-                        SELECT
-                                path, locale, locale_slug,
-                                (100 * stats.current/stats.all) as percent_complete,
-                                stats.waiting+stats.fuzzy as waiting_strings,
-                                stats.untranslated as untranslated
-                        FROM {$wpdb->project_translation_status} stats
-                                LEFT JOIN {$wpdb->gp_projects} p ON stats.project_id = p.id
-                        WHERE
-                                p.parent_project_id = '{$project->id}'
-                " );
-
-                // Split out into $[Locale][Project] = %
-                $translation_locale_statuses = array();
-                $sub_projects = array();
-                foreach ( $rows as $set ) {
-
-                        // Find unique locale key.
-                        $locale_key = $set->locale;
-                        if ( 'default' != $set->locale_slug ) {
-                                $locale_key = $set->locale . '/' . $set->locale_slug;
-                        }
-                        $sub_project = str_replace( "$project_path/", '', $set->path );
-                        $sub_projects[ $sub_project ] = true;
-
-                        /*
-                         * > 50% round down, so that a project with all strings except 1 translated shows 99%, instead of 100%.
-                         * < 50% round up, so that a project with just a few strings shows 1%, instead of 0%.
-                         */
-                        $percent_complete = (float) $set->percent_complete;
-                        $translation_locale_statuses[ $locale_key ][ $sub_project ] = ( $percent_complete > 50 ) ? floor( $percent_complete ) : ceil( $percent_complete );
-
-                        // Increment the amount of waiting and untranslated strings.
-                        if ( ! isset( $translation_locale_statuses[ $locale_key ]['waiting'] ) ) {
-                                $translation_locale_statuses[ $locale_key ]['waiting'] = 0;
-                        }
-                        if ( ! isset( $translation_locale_statuses[ $locale_key ]['untranslated'] ) ) {
-                                $translation_locale_statuses[ $locale_key ]['untranslated'] = 0;
-                        }
-                        $translation_locale_statuses[ $locale_key ]['waiting'] += (int) $set->waiting_strings;
-                        $translation_locale_statuses[ $locale_key ]['untranslated'] += (int) $set->untranslated;
-
-
-                        ksort( $translation_locale_statuses[ $locale_key ], SORT_NATURAL );
-                }
-
-                // Check if the plugin has at least one code project. These won't be created if a plugin
-                // has no text domain defined.
-                $sub_projects = array_keys( $sub_projects );
-                $has_error = ( ! in_array( 'dev', $sub_projects ) && ! in_array( 'stable', $sub_projects ) );
-
-                unset( $project_path, $locale_key, $rows, $set, $sub_project, $sub_projects );
-
-                // Calculate a list of [Locale] = % subtotals
-                $translation_locale_complete = array();
-                foreach ( $translation_locale_statuses as $locale => $sets ) {
-                        unset( $sets['waiting'], $sets['untranslated'] );
-                        $translation_locale_complete[ $locale ] = round( array_sum( $sets ) / count( $sets ), 3 );
-                }
-                unset( $locale, $sets );
-
-
-                // Sort by translation completeness, least number of waiting strings, and locale slug.
-                uksort( $translation_locale_complete, function ( $a, $b ) use ( $translation_locale_complete, $translation_locale_statuses ) {
-                        if ( $translation_locale_complete[ $a ] < $translation_locale_complete[ $b ] ) {
-                                return 1;
-                        } elseif ( $translation_locale_complete[ $a ] == $translation_locale_complete[ $b ] ) {
-                                if ( $translation_locale_statuses[ $a ]['waiting'] != $translation_locale_statuses[ $b ]['waiting'] ) {
-                                        return strnatcmp( $translation_locale_statuses[ $a ]['waiting'], $translation_locale_statuses[ $b ]['waiting'] );
-                                } else {
-                                        return strnatcmp( $a, $b );
-                                }
-                        } else {
-                                return -1;
-                        }
-                } );
-
-                if ( function_exists( 'wporg_get_plugin_icon' ) ) {
-                        $project->icon = wporg_get_plugin_icon( $project->slug, 64 );
-                } else {
-                        $project->icon = '<div class="default-icon"><span class="dashicons dashicons-admin-plugins"></span></div>';
-                }
-
-                $this->tmpl( 'projects-wp-plugins', get_defined_vars() );
-        }
-
-        /**
-         * Prints stats about contributors of a specific project.
-         *
-         * @param string $project_slug Slug of a project.
-         */
-        public function get_plugin_contributors( $project_slug ) {
-                global $wpdb;
-
-                $project_path = 'wp-plugins/' . $project_slug;
-                $project = GP::$project->by_path( $project_path );
-                if ( ! $project ) {
-                        return $this->die_with_404();
-                }
-
-                if ( function_exists( 'wporg_get_plugin_icon' ) ) {
-                        $project->icon = wporg_get_plugin_icon( $project->slug, 64 );
-                } else {
-                        $project->icon = '<div class="default-icon"><span class="dashicons dashicons-admin-plugins"></span></div>';
-                }
 
                 $contributors_by_locale = array();
@@ -157 +46 @@
                 unset( $translation_editors );
 
+                foreach( $this->get_translation_contributors_by_locale( $project->id ) as $row ) {
+                        if ( ! isset( $contributors_by_locale[ $row->locale ] ) ) {
+                                $contributors_by_locale[ $row->locale ] = $default_value;
+                        }
+
+                        if ( isset( $contributors_by_locale[ $row->locale ]['editors'][ $row->user_id ] ) ) {
+                                continue;
+                        }
+
+                        if ( isset( $contributors_by_locale[ $row->locale ]['contributors'][ $row->user_id ] ) ) {
+                                continue;
+                        }
+
+                        $user = get_user_by( 'id', $row->user_id );
+                        if ( ! $user ) {
+                                continue;
+                        }
+
+                        $contributors_by_locale[ $row->locale ]['contributors'][ $row->user_id ] = (object) array(
+                                'nicename'     => $user->user_nicename,
+                                'display_name' => $this->_encode( $user->display_name ),
+                        );
+
+                        $contributors_by_locale[ $row->locale ]['count']++;
+                }
+
                 $sub_projects = $wpdb->get_col( $wpdb->prepare( "
                         SELECT id
@@ -191 +106 @@
                 }
 
-                $chart_data = $this->get_plugin_contributors_chart_data( $project->id, $sub_projects );
-
-                $this->tmpl( 'projects-wp-plugins-contributors', get_defined_vars() );
+                return $contributors_by_locale;
         }
 
@@ -199 +112 @@
          * Generates the chart data for contributors activity.
          *
-         * @param  int    $project_id   The ID of a project. Used to store data as meta.
-         * @param  array $sub_projects Optional. IDs of sub-projects.
+         * @param GP_Project $project_id The project.
          * @return array The data to build a chart via Chartist.js.
          */
-        private function get_plugin_contributors_chart_data( $project_id, $sub_projects = null ) {
-                $chart_data = gp_get_meta( 'wp-plugins', $project_id, 'contributors-chart-data' );
-                if ( $chart_data ) {
-                        if ( $chart_data['last_updated'] + DAY_IN_SECONDS > time() ) {
-                                return $chart_data;
-                        }
-                }
-
+        protected function get_contributors_chart_data( $project ) {
                 global $wpdb;
 
-                if ( ! $sub_projects ) {
-                        $sub_projects = $wpdb->get_col( $wpdb->prepare( "
-                                SELECT id
-                                FROM {$wpdb->gp_projects}
-                                WHERE parent_project_id = %d
-                        ", $$project_id ) );
-                }
-
+                $sub_projects = $wpdb->get_col( $wpdb->prepare( "
+                        SELECT id
+                        FROM {$wpdb->gp_projects}
+                        WHERE parent_project_id = %d
+                ", $project->id ) );
+
+                $project_ids = array_merge( array( $project->id ), $sub_projects );
                 $translation_set_ids = $wpdb->get_col( "
-                        SELECT `id` FROM {$wpdb->gp_translation_sets} WHERE `project_id` IN (" . implode( ',', $sub_projects ) . ")
+                        SELECT `id` FROM {$wpdb->gp_translation_sets} WHERE `project_id` IN (" . implode( ',', $project_ids ) . ")
                 " );
 
@@ -277 +181 @@
                 }
 
-                $last_updated = time();
-                $chart_data = compact( 'labels', 'series', 'last_updated' );
-
-                gp_update_meta( $project_id, 'contributors-chart-data', $chart_data, 'wp-plugins' );
+                $chart_data = compact( 'labels', 'series' );
 
                 return $chart_data;
@@ -288 +189 @@
          * Prints stats about language packs of a specific project.
          *
-         * @param string $project_slug Slug of a project.
-         */
-        public function get_plugin_language_packs( $project_slug ) {
-                $project_path = 'wp-plugins/' . $project_slug;
-                $project = GP::$project->by_path( $project_path );
-                if ( ! $project ) {
-                        return $this->die_with_404();
-                }
-
-                if ( function_exists( 'wporg_get_plugin_icon' ) ) {
-                        $project->icon = wporg_get_plugin_icon( $project->slug, 64 );
-                } else {
-                        $project->icon = '<div class="default-icon"><span class="dashicons dashicons-admin-plugins"></span></div>';
-                }
-
+         * @param string $type Type of the language pack, plugin or theme.
+         * @param string $slug Slug of a project.
+         */
+        public function get_language_packs( $type, $slug ) {
                 $http_context = stream_context_create( array(
                         'http' => array(
@@ -308 +198 @@
                         ),
                 ) );
-                $json = file_get_contents( "https://api.wordpress.org/translations/plugins/1.0/?slug={$project_slug}", null, $http_context );
+                if ( 'plugin' === $type ) {
+                        $type = 'plugins';
+                } else {
+                        $type = 'themes';
+                }
+                $json = file_get_contents( "https://api.wordpress.org/translations/$type/1.0/?slug={$slug}", null, $http_context );
                 $language_packs = $json && '{' == $json[0] ? json_decode( $json ) : null;
 
-                $this->tmpl( 'projects-wp-plugins-language-packs', get_defined_vars() );
+                return $language_packs;
         }
 

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

@@ -1 +1 @@
 <?php
 
-class WPorg_GP_Route_WP_Plugins extends GP_Route {
+class WPorg_GP_Route_WP_Plugins extends WPorg_GP_Route_WP_Directory {
 
         /**
@@ -94 +94 @@
                 } );
 
-                if ( function_exists( 'wporg_get_plugin_icon' ) ) {
-                        $project->icon = wporg_get_plugin_icon( $project->slug, 64 );
-                } else {
-                        $project->icon = '<div class="default-icon"><span class="dashicons dashicons-admin-plugins"></span></div>';
-                }
+                $project->icon = $this->get_plugin_icon( $project, 64 );
 
                 $this->tmpl( 'projects-wp-plugins', get_defined_vars() );
@@ -117 +113 @@
                 }
 
-                if ( function_exists( 'wporg_get_plugin_icon' ) ) {
-                        $project->icon = wporg_get_plugin_icon( $project->slug, 64 );
-                } else {
-                        $project->icon = '<div class="default-icon"><span class="dashicons dashicons-admin-plugins"></span></div>';
+                $project->icon = $this->get_plugin_icon( $project, 64 );
+
+                $contributors_by_locale = gp_get_meta( 'wp-plugins', $project->id, 'contributors-by-locale' );
+                if ( ! $contributors_by_locale || $contributors_by_locale['last_updated'] + HOUR_IN_SECONDS < time() ) {
+                        $contributors_by_locale = $this->get_contributors( $project );
+                        $contributors_by_locale['last_updated'] = time();
+                        gp_update_meta( $project->id, 'contributors-by-locale', $contributors_by_locale, 'wp-plugins' );
                 }
 
-                $contributors_by_locale = array();
-                $default_value = array(
-                        'count' => 0,
-                        'editors' => array(),
-                        'contributors' => array(),
-                );
-
-                $translation_editors = $wpdb->get_results( $wpdb->prepare( "
-                        SELECT
-                                `user_id`, `locale`
-                        FROM {$wpdb->wporg_translation_editors}
-                        WHERE `project_id` = %d
-                ", $project->id ), OBJECT );
-
-                foreach ( $translation_editors as $translation_editor ) {
-                        if ( ! isset( $contributors_by_locale[ $translation_editor->locale ] ) ) {
-                                $contributors_by_locale[ $translation_editor->locale ] = $default_value;
-                        }
-
-                        $user = get_user_by( 'id', $translation_editor->user_id );
-                        if ( ! $user ) {
-                                continue;
-                        }
-
-                        $contributors_by_locale[ $translation_editor->locale ]['editors'][ $translation_editor->user_id ] = (object) array(
-                                'nicename'     => $user->user_nicename,
-                                'display_name' => $this->_encode( $user->display_name ),
-                        );
-
-                        $contributors_by_locale[ $translation_editor->locale ]['count']++;
+                $chart_data = gp_get_meta( 'wp-plugins', $project->id, 'contributors-chart-data' );
+                if ( ! $chart_data || $chart_data['last_updated'] + DAY_IN_SECONDS < time() ) {
+                        $chart_data = $this->get_contributors_chart_data( $project );
+                        $chart_data['last_updated'] = time();
+                        gp_update_meta( $project->id, 'contributors-chart-data', $chart_data, 'wp-plugins' );
                 }
 
-                unset( $translation_editors );
-
-                $sub_projects = $wpdb->get_col( $wpdb->prepare( "
-                        SELECT id
-                        FROM {$wpdb->gp_projects}
-                        WHERE parent_project_id = %d
-                ", $project->id ) );
-
-                foreach ( $sub_projects as $sub_project ) {
-                        foreach( $this->get_translation_contributors_by_locale( $sub_project ) as $row ) {
-                                if ( ! isset( $contributors_by_locale[ $row->locale ] ) ) {
-                                        $contributors_by_locale[ $row->locale ] = $default_value;
-                                }
-
-                                if ( isset( $contributors_by_locale[ $row->locale ]['editors'][ $row->user_id ] ) ) {
-                                        continue;
-                                }
-
-                                if ( isset( $contributors_by_locale[ $row->locale ]['contributors'][ $row->user_id ] ) ) {
-                                        continue;
-                                }
-
-                                $user = get_user_by( 'id', $row->user_id );
-                                if ( ! $user ) {
-                                        continue;
-                                }
-
-                                $contributors_by_locale[ $row->locale ]['contributors'][ $row->user_id ] = (object) array(
-                                        'nicename'     => $user->user_nicename,
-                                        'display_name' => $this->_encode( $user->display_name ),
-                                );
-
-                                $contributors_by_locale[ $row->locale ]['count']++;
-                        }
-                }
-
-                $chart_data = $this->get_plugin_contributors_chart_data( $project->id, $sub_projects );
+                unset( $contributors_by_locale['last_updated'], $chart_data['last_updated'] );
 
                 $this->tmpl( 'projects-wp-plugins-contributors', get_defined_vars() );
-        }
-
-        /**
-         * Generates the chart data for contributors activity.
-         *
-         * @param  int    $project_id   The ID of a project. Used to store data as meta.
-         * @param  array $sub_projects Optional. IDs of sub-projects.
-         * @return array The data to build a chart via Chartist.js.
-         */
-        private function get_plugin_contributors_chart_data( $project_id, $sub_projects = null ) {
-                $chart_data = gp_get_meta( 'wp-plugins', $project_id, 'contributors-chart-data' );
-                if ( $chart_data ) {
-                        if ( $chart_data['last_updated'] + DAY_IN_SECONDS > time() ) {
-                                return $chart_data;
-                        }
-                }
-
-                global $wpdb;
-
-                if ( ! $sub_projects ) {
-                        $sub_projects = $wpdb->get_col( $wpdb->prepare( "
-                                SELECT id
-                                FROM {$wpdb->gp_projects}
-                                WHERE parent_project_id = %d
-                        ", $$project_id ) );
-                }
-
-                $translation_set_ids = $wpdb->get_col( "
-                        SELECT `id` FROM {$wpdb->gp_translation_sets} WHERE `project_id` IN (" . implode( ',', $sub_projects ) . ")
-                " );
-
-                if ( ! $translation_set_ids ) {
-                        return array();
-                }
-
-                $date_begin = new DateTime( '-6 day' );
-                $date_end = new DateTime( 'NOW' );
-                $date_interval = new DateInterval( 'P1D' );
-                $date_range = new DatePeriod( $date_begin, $date_interval, $date_end );
-
-                $days = array();
-                foreach( $date_range as $date ) {
-                        $days[] = $date->format( 'Y-m-d' );
-                }
-                $days[] = $date_end->format( 'Y-m-d' );
-
-                $counts = $wpdb->get_results( "
-                        SELECT
-                                DATE(date_modified) AS `day`, COUNT(*) AS `count`, `status`
-                        FROM {$wpdb->gp_translations}
-                        WHERE
-                                `translation_set_id` IN (" . implode( ',', $translation_set_ids ) . ")
-                                AND date_modified >= ( CURDATE() - INTERVAL 7 DAY )
-                        GROUP BY `status`, `day`
-                        ORDER BY `day` DESC
-                " );
-
-                $status = array( 'current', 'waiting', 'rejected' );
-                $data = [];
-                foreach ( $days as $day ) {
-                        $data[ $day ] = array_fill_keys( $status, 0 );
-                        foreach ( $counts as $count ) {
-                                if ( $count->day !== $day || ! in_array( $count->status, $status ) ) {
-                                        continue;
-                                }
-
-                                $data[ $day ][ $count->status ] = (int) $count->count;
-                        }
-                }
-
-                $labels = array_keys( $data );
-                array_pop( $labels );
-                $labels[] = ''; // Don't show a label for today
-
-                $series = array();
-                $series_data = array_values( $data );
-                foreach ( $status as $stati ) {
-                        $series[] = (object) array(
-                                'name' => $stati,
-                                'data' => wp_list_pluck( $series_data, $stati ),
-                        );
-                }
-
-                $last_updated = time();
-                $chart_data = compact( 'labels', 'series', 'last_updated' );
-
-                gp_update_meta( $project_id, 'contributors-chart-data', $chart_data, 'wp-plugins' );
-
-                return $chart_data;
         }
 
@@ -297 +146 @@
                 }
 
-                if ( function_exists( 'wporg_get_plugin_icon' ) ) {
-                        $project->icon = wporg_get_plugin_icon( $project->slug, 64 );
-                } else {
-                        $project->icon = '<div class="default-icon"><span class="dashicons dashicons-admin-plugins"></span></div>';
-                }
+                $project->icon = $this->get_plugin_icon( $project, 64 );
 
                 $http_context = stream_context_create( array(
@@ -315 +160 @@
 
         /**
-         * Retrieves translators of a specific project.
+         * Retrieves the icon of a plugin.
          *
-         * @param int $project_id Project ID.
-         * @return object Translators of the project.
+         * @param GP_Project $project The plugin project.
+         * @param int        $size    Optional. The size of the icon. Default 64.
+         * @return string HTML markup for the icon.
          */
-        private function get_translation_contributors_by_locale( $project_id ) {
-                global $wpdb;
+        private function get_plugin_icon( $project, $size = 64 ) {
+                $default = '<div class="default-icon"><span class="dashicons dashicons-admin-plugins"></span></div>';
 
-                $sql = $wpdb->prepare( "
-                        SELECT ts.`locale`, ts.`slug` AS `locale_slug`, t.`user_id`
-                        FROM `{$wpdb->gp_translations}` t, `{$wpdb->gp_translation_sets}` ts
-                        WHERE t.`translation_set_id` = ts.`id`
-                            AND t.`user_id` IS NOT NULL AND t.`user_id` != 0
-                            AND t.`date_modified` > %s
-                            AND ts.`project_id` = %d
-                            AND t.`status` <> 'rejected'
-                        GROUP BY ts.`locale`, ts.`slug`, t.`user_id`
-                ", date( 'Y-m-d', time() - YEAR_IN_SECONDS ), $project_id );
+                if ( function_exists( 'wporg_get_plugin_icon' ) ) {
+                        $icon = wporg_get_plugin_icon( $project->slug, $size );
+                }
 
-                return $wpdb->get_results( $sql );
-        }
+                if ( $icon ) {
+                        return $icon;
+                }
 
-        private function _encode( $raw ) {
-                $raw = mb_convert_encoding( $raw, 'UTF-8', 'ASCII, JIS, UTF-8, Windows-1252, ISO-8859-1' );
-                return ent2ncr( htmlspecialchars_decode( htmlentities( $raw, ENT_NOQUOTES, 'UTF-8' ), ENT_NOQUOTES ) );
+                return $default;
         }
 }

sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-gp-routes/routes/wp-themes.php

@@ -1 +1 @@
 <?php
 
-class WPorg_GP_Route_WP_Plugins extends GP_Route {
+class WPorg_GP_Route_WP_Themes extends WPorg_GP_Route_WP_Directory {
 
         /**
@@ -8 +8 @@
          * @param string $project_slug Slug of a project.
          */
-        public function get_plugin_projects( $project_slug ) {
+        public function get_theme_projects( $project_slug ) {
                 global $wpdb;
 
-                $project_path = 'wp-plugins/' . $project_slug;
+                $project_path = 'wp-themes/' . $project_slug;
                 $project = GP::$project->by_path( $project_path );
                 if ( ! $project ) {
@@ -26 +26 @@
                                 LEFT JOIN {$wpdb->gp_projects} p ON stats.project_id = p.id
                         WHERE
-                                p.parent_project_id = '{$project->id}'
+                                p.id = '{$project->id}'
                 " );
 
@@ -39 +39 @@
                                 $locale_key = $set->locale . '/' . $set->locale_slug;
                         }
-                        $sub_project = str_replace( "$project_path/", '', $set->path );
-                        $sub_projects[ $sub_project ] = true;
 
                         /*
@@ -47 +45 @@
                          */
                         $percent_complete = (float) $set->percent_complete;
-                        $translation_locale_statuses[ $locale_key ][ $sub_project ] = ( $percent_complete > 50 ) ? floor( $percent_complete ) : ceil( $percent_complete );
+                        $translation_locale_statuses[ $locale_key ]['stable'] = ( $percent_complete > 50 ) ? floor( $percent_complete ) : ceil( $percent_complete );
 
                         // Increment the amount of waiting and untranslated strings.
@@ -62 +60 @@
                         ksort( $translation_locale_statuses[ $locale_key ], SORT_NATURAL );
                 }
-
-                // Check if the plugin has at least one code project. These won't be created if a plugin
-                // has no text domain defined.
-                $sub_projects = array_keys( $sub_projects );
-                $has_error = ( ! in_array( 'dev', $sub_projects ) && ! in_array( 'stable', $sub_projects ) );
 
                 unset( $project_path, $locale_key, $rows, $set, $sub_project, $sub_projects );
@@ -94 +87 @@
                 } );
 
-                if ( function_exists( 'wporg_get_plugin_icon' ) ) {
-                        $project->icon = wporg_get_plugin_icon( $project->slug, 64 );
-                } else {
-                        $project->icon = '<div class="default-icon"><span class="dashicons dashicons-admin-plugins"></span></div>';
-                }
+                $project->icon = $this->get_theme_icon( $project, 64 );
 
-                $this->tmpl( 'projects-wp-plugins', get_defined_vars() );
+                $this->tmpl( 'projects-wp-themes', get_defined_vars() );
         }
 
@@ -108 +97 @@
          * @param string $project_slug Slug of a project.
          */
-        public function get_plugin_contributors( $project_slug ) {
+        public function get_theme_contributors( $project_slug ) {
                 global $wpdb;
 
-                $project_path = 'wp-plugins/' . $project_slug;
+                $project_path = 'wp-themes/' . $project_slug;
                 $project = GP::$project->by_path( $project_path );
                 if ( ! $project ) {
@@ -117 +106 @@
                 }
 
-                if ( function_exists( 'wporg_get_plugin_icon' ) ) {
-                        $project->icon = wporg_get_plugin_icon( $project->slug, 64 );
-                } else {
-                        $project->icon = '<div class="default-icon"><span class="dashicons dashicons-admin-plugins"></span></div>';
+                $project->icon = $this->get_theme_icon( $project, 64 );
+
+                $contributors_by_locale = gp_get_meta( 'wp-themes', $project->id, 'contributors-by-locale' );
+                if ( ! $contributors_by_locale || $contributors_by_locale['last_updated'] + HOUR_IN_SECONDS < time() ) {
+                        $contributors_by_locale = $this->get_contributors( $project );
+                        $contributors_by_locale['last_updated'] = time();
+                        gp_update_meta( $project->id, 'contributors-by-locale', $contributors_by_locale, 'wp-themes' );
                 }
 
-                $contributors_by_locale = array();
-                $default_value = array(
-                        'count' => 0,
-                        'editors' => array(),
-                        'contributors' => array(),
-                );
-
-                $translation_editors = $wpdb->get_results( $wpdb->prepare( "
-                        SELECT
-                                `user_id`, `locale`
-                        FROM {$wpdb->wporg_translation_editors}
-                        WHERE `project_id` = %d
-                ", $project->id ), OBJECT );
-
-                foreach ( $translation_editors as $translation_editor ) {
-                        if ( ! isset( $contributors_by_locale[ $translation_editor->locale ] ) ) {
-                                $contributors_by_locale[ $translation_editor->locale ] = $default_value;
-                        }
-
-                        $user = get_user_by( 'id', $translation_editor->user_id );
-                        if ( ! $user ) {
-                                continue;
-                        }
-
-                        $contributors_by_locale[ $translation_editor->locale ]['editors'][ $translation_editor->user_id ] = (object) array(
-                                'nicename'     => $user->user_nicename,
-                                'display_name' => $this->_encode( $user->display_name ),
-                        );
-
-                        $contributors_by_locale[ $translation_editor->locale ]['count']++;
+                $chart_data = gp_get_meta( 'wp-themes', $project->id, 'contributors-chart-data' );
+                if ( ! $chart_data || $chart_data['last_updated'] + DAY_IN_SECONDS < time() ) {
+                        $chart_data = $this->get_contributors_chart_data( $project );
+                        $chart_data['last_updated'] = time();
+                        gp_update_meta( $project->id, 'contributors-chart-data', $chart_data, 'wp-themes' );
                 }
 
-                unset( $translation_editors );
-
-                $sub_projects = $wpdb->get_col( $wpdb->prepare( "
-                        SELECT id
-                        FROM {$wpdb->gp_projects}
-                        WHERE parent_project_id = %d
-                ", $project->id ) );
-
-                foreach ( $sub_projects as $sub_project ) {
-                        foreach( $this->get_translation_contributors_by_locale( $sub_project ) as $row ) {
-                                if ( ! isset( $contributors_by_locale[ $row->locale ] ) ) {
-                                        $contributors_by_locale[ $row->locale ] = $default_value;
-                                }
-
-                                if ( isset( $contributors_by_locale[ $row->locale ]['editors'][ $row->user_id ] ) ) {
-                                        continue;
-                                }
-
-                                if ( isset( $contributors_by_locale[ $row->locale ]['contributors'][ $row->user_id ] ) ) {
-                                        continue;
-                                }
-
-                                $user = get_user_by( 'id', $row->user_id );
-                                if ( ! $user ) {
-                                        continue;
-                                }
-
-                                $contributors_by_locale[ $row->locale ]['contributors'][ $row->user_id ] = (object) array(
-                                        'nicename'     => $user->user_nicename,
-                                        'display_name' => $this->_encode( $user->display_name ),
-                                );
-
-                                $contributors_by_locale[ $row->locale ]['count']++;
-                        }
-                }
-
-                $chart_data = $this->get_plugin_contributors_chart_data( $project->id, $sub_projects );
+                unset( $contributors_by_locale['last_updated'], $chart_data['last_updated'] );
 
                 $this->tmpl( 'projects-wp-plugins-contributors', get_defined_vars() );
-        }
-
-        /**
-         * Generates the chart data for contributors activity.
-         *
-         * @param  int    $project_id   The ID of a project. Used to store data as meta.
-         * @param  array $sub_projects Optional. IDs of sub-projects.
-         * @return array The data to build a chart via Chartist.js.
-         */
-        private function get_plugin_contributors_chart_data( $project_id, $sub_projects = null ) {
-                $chart_data = gp_get_meta( 'wp-plugins', $project_id, 'contributors-chart-data' );
-                if ( $chart_data ) {
-                        if ( $chart_data['last_updated'] + DAY_IN_SECONDS > time() ) {
-                                return $chart_data;
-                        }
-                }
-
-                global $wpdb;
-
-                if ( ! $sub_projects ) {
-                        $sub_projects = $wpdb->get_col( $wpdb->prepare( "
-                                SELECT id
-                                FROM {$wpdb->gp_projects}
-                                WHERE parent_project_id = %d
-                        ", $$project_id ) );
-                }
-
-                $translation_set_ids = $wpdb->get_col( "
-                        SELECT `id` FROM {$wpdb->gp_translation_sets} WHERE `project_id` IN (" . implode( ',', $sub_projects ) . ")
-                " );
-
-                if ( ! $translation_set_ids ) {
-                        return array();
-                }
-
-                $date_begin = new DateTime( '-6 day' );
-                $date_end = new DateTime( 'NOW' );
-                $date_interval = new DateInterval( 'P1D' );
-                $date_range = new DatePeriod( $date_begin, $date_interval, $date_end );
-
-                $days = array();
-                foreach( $date_range as $date ) {
-                        $days[] = $date->format( 'Y-m-d' );
-                }
-                $days[] = $date_end->format( 'Y-m-d' );
-
-                $counts = $wpdb->get_results( "
-                        SELECT
-                                DATE(date_modified) AS `day`, COUNT(*) AS `count`, `status`
-                        FROM {$wpdb->gp_translations}
-                        WHERE
-                                `translation_set_id` IN (" . implode( ',', $translation_set_ids ) . ")
-                                AND date_modified >= ( CURDATE() - INTERVAL 7 DAY )
-                        GROUP BY `status`, `day`
-                        ORDER BY `day` DESC
-                " );
-
-                $status = array( 'current', 'waiting', 'rejected' );
-                $data = [];
-                foreach ( $days as $day ) {
-                        $data[ $day ] = array_fill_keys( $status, 0 );
-                        foreach ( $counts as $count ) {
-                                if ( $count->day !== $day || ! in_array( $count->status, $status ) ) {
-                                        continue;
-                                }
-
-                                $data[ $day ][ $count->status ] = (int) $count->count;
-                        }
-                }
-
-                $labels = array_keys( $data );
-                array_pop( $labels );
-                $labels[] = ''; // Don't show a label for today
-
-                $series = array();
-                $series_data = array_values( $data );
-                foreach ( $status as $stati ) {
-                        $series[] = (object) array(
-                                'name' => $stati,
-                                'data' => wp_list_pluck( $series_data, $stati ),
-                        );
-                }
-
-                $last_updated = time();
-                $chart_data = compact( 'labels', 'series', 'last_updated' );
-
-                gp_update_meta( $project_id, 'contributors-chart-data', $chart_data, 'wp-plugins' );
-
-                return $chart_data;
         }
 
@@ -290 +132 @@
          * @param string $project_slug Slug of a project.
          */
-        public function get_plugin_language_packs( $project_slug ) {
-                $project_path = 'wp-plugins/' . $project_slug;
+        public function get_theme_language_packs( $project_slug ) {
+                $project_path = 'wp-themes/' . $project_slug;
                 $project = GP::$project->by_path( $project_path );
                 if ( ! $project ) {
@@ -297 +139 @@
                 }
 
-                if ( function_exists( 'wporg_get_plugin_icon' ) ) {
-                        $project->icon = wporg_get_plugin_icon( $project->slug, 64 );
-                } else {
-                        $project->icon = '<div class="default-icon"><span class="dashicons dashicons-admin-plugins"></span></div>';
-                }
+                $project->icon = $this->get_theme_icon( $project, 64 );
 
-                $http_context = stream_context_create( array(
-                        'http' => array(
-                                'user_agent' => 'WordPress.org Translate',
-                        ),
-                ) );
-                $json = file_get_contents( "https://api.wordpress.org/translations/plugins/1.0/?slug={$project_slug}", null, $http_context );
-                $language_packs = $json && '{' == $json[0] ? json_decode( $json ) : null;
+                $language_packs = $this->get_language_packs( 'theme', $project_slug );
 
                 $this->tmpl( 'projects-wp-plugins-language-packs', get_defined_vars() );
@@ -315 +147 @@
 
         /**
-         * Retrieves translators of a specific project.
+         * Retrieves the icon of a theme.
          *
-         * @param int $project_id Project ID.
-         * @return object Translators of the project.
+         * @param GP_Project $project The theme project.
+         * @param int        $size    Optional. The size of the icon. Default 64.
+         * @return string HTML markup for the icon.
          */
-        private function get_translation_contributors_by_locale( $project_id ) {
-                global $wpdb;
+        private function get_theme_icon( $project, $size = 64 ) {
+                $default = '<div class="default-icon"><span class="dashicons dashicons-admin-themes"></span></div>';
 
-                $sql = $wpdb->prepare( "
-                        SELECT ts.`locale`, ts.`slug` AS `locale_slug`, t.`user_id`
-                        FROM `{$wpdb->gp_translations}` t, `{$wpdb->gp_translation_sets}` ts
-                        WHERE t.`translation_set_id` = ts.`id`
-                            AND t.`user_id` IS NOT NULL AND t.`user_id` != 0
-                            AND t.`date_modified` > %s
-                            AND ts.`project_id` = %d
-                            AND t.`status` <> 'rejected'
-                        GROUP BY ts.`locale`, ts.`slug`, t.`user_id`
-                ", date( 'Y-m-d', time() - YEAR_IN_SECONDS ), $project_id );
+                $screenshot = gp_get_meta( 'wp-themes', $project->id, 'screenshot' );
+                if ( $screenshot ) {
+                        return sprintf(
+                                '<div class="icon"><img src="%s" alt="" width="%d" height="%d"></div>',
+                                esc_url( 'https://i0.wp.com/' . $screenshot . '?w=' . $size * 2 . '&strip=all' ),
+                                $size,
+                                $size
+                        );
+                }
 
-                return $wpdb->get_results( $sql );
-        }
-
-        private function _encode( $raw ) {
-                $raw = mb_convert_encoding( $raw, 'UTF-8', 'ASCII, JIS, UTF-8, Windows-1252, ISO-8859-1' );
-                return ent2ncr( htmlspecialchars_decode( htmlentities( $raw, ENT_NOQUOTES, 'UTF-8' ), ENT_NOQUOTES ) );
+                return $default;
         }
 }

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

@@ -13 +13 @@
 require_once __DIR__ . '/routes/locale.php';
 require_once __DIR__ . '/routes/stats-overview.php';
+require_once __DIR__ . '/routes/wp-directory.php';
 require_once __DIR__ . '/routes/wp-plugins.php';
+require_once __DIR__ . '/routes/wp-themes.php';
 
 class WPorg_GP_Routes {
@@ -34 +36 @@
          *  - /languages/$locale/$path
          *  - /profile/$path
+         *  - /projects/wp-plugins/?
+         *  - /projects/wp-themes/?
          *
          * Adds:
@@ -45 +49 @@
          *  - /projects/wp-plugins/$project/contributors
          *  - /projects/wp-plugins/$project/language-packs
+         *  - /projects/wp-themes/$project
+         *  - /projects/wp-themes/$project/contributors
+         *  - /projects/wp-themes/$project/language-packs
          */
         public function register_routes() {
@@ -77 +84 @@
                         GP::$router->prepend( "/projects/wp-plugins/$project/contributors", array( 'WPorg_GP_Route_WP_Plugins', 'get_plugin_contributors' ) );
                         GP::$router->prepend( "/projects/wp-plugins/$project/language-packs", array( 'WPorg_GP_Route_WP_Plugins', 'get_plugin_language_packs' ) );
+                        GP::$router->prepend( "/projects/wp-themes/$project", array( 'WPorg_GP_Route_WP_Themes', 'get_theme_projects' ) );
+                        GP::$router->prepend( "/projects/wp-themes/$project/contributors", array( 'WPorg_GP_Route_WP_Themes', 'get_theme_contributors' ) );
+                        GP::$router->prepend( "/projects/wp-themes/$project/language-packs", array( 'WPorg_GP_Route_WP_Themes', 'get_theme_language_packs' ) );
                 }
         }