<!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>[1399] sites/trunk/global.wordpress.org/public_html/wp-content/mu-plugins/downloads/rosetta-downloads.php: Rosetta: Update page for download stats.</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/1399">1399</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/1399","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-03-13 21:48:54 +0000 (Fri, 13 Mar 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'>Rosetta: Update page for download stats.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkglobalwordpressorgpublic_htmlwpcontentmupluginsdownloadsrosettadownloadsphp">sites/trunk/global.wordpress.org/public_html/wp-content/mu-plugins/downloads/rosetta-downloads.php</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkglobalwordpressorgpublic_htmlwpcontentmupluginsdownloadsrosettadownloadsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/global.wordpress.org/public_html/wp-content/mu-plugins/downloads/rosetta-downloads.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/global.wordpress.org/public_html/wp-content/mu-plugins/downloads/rosetta-downloads.php        2015-03-13 13:00:33 UTC (rev 1398)
+++ sites/trunk/global.wordpress.org/public_html/wp-content/mu-plugins/downloads/rosetta-downloads.php  2015-03-13 21:48:54 UTC (rev 1399)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,53 +1,190 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/* Plugin Name: Rosetta Downloads
- * Author: Nacin
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/**
+ * Plugin Name: Rosetta Downloads
+ * Plugin URI: https://wordpress.org/
+ * Description: Dashboard page for download stats.
+ * Author: Nacin, Dominik Schilling
+ * Version: 1.0
</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"> class Rosetta_Downloads {
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        function __construct() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**
+        * Class Constructor.
+        */
+       public function __construct() {
+               add_action( 'plugins_loaded', array( $this, 'plugins_loaded' ) );
+       }
+
+       /**
+        * Attaches hooks once plugins are loaded.
+        */
+       public function plugins_loaded() {
</ins><span class="cx" style="display: block; padding: 0 10px">                 add_action( 'admin_menu', array( $this, 'admin_menu' ) );
</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">-        function admin_menu() {
-               add_dashboard_page( 'Download Stats', 'Download Stats', 'read', 'download-stats', array( $this, 'render_download_stats' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**
+        * Registers "Download Stats" page.
+        */
+       public function admin_menu() {
+               add_dashboard_page(
+                       __( 'Download Stats', 'rosetta' ),
+                       __( 'Download Stats', 'rosetta' ),
+                       'read',
+                       'download-stats',
+                       array( $this, 'render_download_stats' )
+               );
</ins><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">-        function get_counts() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**
+        * Returns download counts for release packages of the current stable branch.
+        *
+        * @return array Download counts per locale.
+        */
+       function get_release_download_counts() {
</ins><span class="cx" style="display: block; padding: 0 10px">                 global $wpdb;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $orderby = isset( $_GET['desc'] ) ? 'SUM(`downloads`) DESC' : '`locale`';
-               $stable_branch = implode( '.', array_map( 'absint', explode( '.', WP_CORE_STABLE_BRANCH ) ) );
-               return $wpdb->get_results( "SELECT `locale`, SUM(`downloads`) FROM `download_counts` WHERE `release` LIKE '{$stable_branch}%' AND `release` NOT LIKE '%-%' GROUP BY `locale` ORDER BY $orderby", ARRAY_N );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+               $cache = wp_cache_get( 'downloadcounts:release', 'rosetta' );
+               if ( false !== $cache ) {
+                       return $cache;
+               }
+
+               $results = $wpdb->get_results( $wpdb->prepare( "
+                       SELECT
+                               `locale`,
+                               SUM(`downloads`) AS downloads
+                       FROM `download_counts`
+                       WHERE
+                               `release` LIKE %s AND
+                               `release` NOT LIKE '%%-%%'
+                       GROUP BY `locale`
+               ", WP_CORE_STABLE_BRANCH . '%' ) );
+
+               if ( ! $results ) {
+                       return array();
+               }
+
+               $counts = wp_list_pluck( $results, 'downloads', 'locale' );
+
+               wp_cache_add( 'downloadcounts:release', $counts, 'rosetta', 60 );
+
+               return $counts;
</ins><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">+        /**
+        * Returns download counts for language packs of the current stable branch.
+        *
+        * @return array Download counts per locale.
+        */
+       function get_translation_download_counts() {
+               global $wpdb;
+
+               $cache = wp_cache_get( 'downloadcounts:translation', 'rosetta' );
+               if ( false !== $cache ) {
+                       return $cache;
+               }
+
+               $results = $wpdb->get_results( $wpdb->prepare( "
+                       SELECT `locale`, SUM(`downloads`) AS downloads
+                       FROM `translation_download_counts`
+                       WHERE
+                               `version` LIKE %s AND
+                               `type` = 'core' AND
+                               `domain` = 'default'
+                       GROUP BY `locale`
+               ", WP_CORE_STABLE_BRANCH . '%' ) );
+
+               if ( ! $results ) {
+                       return array();
+               }
+
+               $counts = wp_list_pluck( $results, 'downloads', 'locale' );
+
+               wp_cache_add( 'downloadcounts:translation', $counts, 'rosetta', 60 );
+
+               return $counts;
+       }
+
+       /**
+        * Renders the "Download Stats" page.
+        */
</ins><span class="cx" style="display: block; padding: 0 10px">         function render_download_stats() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                echo '<div class="wrap">';
-               screen_icon();
-               echo '<h2>' . __( 'Download Stats', 'rosetta' ) . '</h2>';
-               echo '<table cellpadding=3 cellspacing=2>';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $total_release_counts = $total_translation_counts = 0;
+               $this_locale = get_locale();
+               $release_counts = $this->get_release_download_counts();
+               $translation_counts = $this->get_translation_download_counts();
+               $locales = array_unique( array_merge( array_keys( $release_counts ), array_keys( $translation_counts ) ) );
+               $rows = 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">-                echo '<p>' . sprintf( __( 'This page shows the <a href="%s">Download Counter</a> number &mdash; total downloads of WordPress %s &mdash; broken down by locale.', 'rosetta' ), 'https://wordpress.org/download/counter/', esc_html( WP_CORE_STABLE_BRANCH ) ) . '</p>';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         foreach ( $locales as $locale ) {
+                       $release_count = isset( $release_counts[ $locale ] ) ? $release_counts[ $locale ] : 0;
+                       $translation_count = isset( $translation_counts[ $locale ] ) ? $translation_counts[ $locale ] : 0;
+                       $total_release_counts += $release_count;
+                       $total_translation_counts += $translation_count;
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $rows = array();
-               $total = 0;
-               $this_locale = get_locale();
-               foreach ( $this->get_counts() as $value ) {
-                       list( $locale, $sum ) = $value;
-                       $total += $sum;
-                       $sum = number_format_i18n( $sum );
-                       $highlight = $locale == $this_locale ? 'background:#ffffe0;border:1px solid #e6db55;font-weight:bold;' : '';
-                       $row = "<tr><td>$locale</td><td style='{$highlight}text-align:right'>$sum</td></tr>";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $highlight = ( $locale == $this_locale ) ? ' style="background:#ffffe0;font-weight:bold"' : '';
+                       $row = sprintf(
+                               '<tr%s><td>%s</td><td style="text-align:right">%s</td><td style="text-align:right">%s</td></tr>',
+                               $highlight,
+                               $locale,
+                               $release_count ? number_format_i18n( $release_count ) : '&mdash;',
+                               $translation_count ? number_format_i18n( $translation_count ) : '&mdash;'
+                       );
+
</ins><span class="cx" style="display: block; padding: 0 10px">                         if ( $locale == 'en' ) {
</span><span class="cx" style="display: block; padding: 0 10px">                                $rows = array_merge( array( $row ), $rows );
</span><span class="cx" style="display: block; padding: 0 10px">                        } else {
</span><span class="cx" style="display: block; padding: 0 10px">                                $rows[] = $row;
</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">-                echo "<tr><td style='width:100px'><strong>" . _x( 'All', 'locales', 'rosetta' ) . "</strong></td><td style='text-align:right'><strong>" . number_format_i18n( $total ) . "</strong></td></tr>";
-               echo implode( "\n", $rows );
-               echo '</table>';
-       }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         ?>
+               <div class="wrap">
+                       <h2><?php _e( 'Download Stats', 'rosetta' ); ?></h2>
+                       <p>
+                               <?php
+                               printf(
+                                       __( 'This page shows the <a href="%s">Download Counter</a> number &mdash; total downloads of WordPress %s &mdash; broken down by locale.', 'rosetta' ),
+                                       'https://wordpress.org/download/counter/',
+                                       esc_html( WP_CORE_STABLE_BRANCH )
+                               );
+                               ?>
+                       </p>
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                        <table class="widefat fixed striped" style="max-width:400px">
+                               <thead>
+                                       <tr>
+                                               <th scope="col" style="width:80px"><?php _e( 'Locale', 'rosetta' ); ?></th>
+                                               <th scope="col" style="text-align:right"><?php _e( 'Release Package', 'rosetta' ); ?></th>
+                                               <th scope="col" style="text-align:right"><?php _e( 'Language Pack', 'rosetta' ); ?> <abbr title="Since March 11, 2015.">*</abbr></th>
+                                       </tr>
+                               </thead>
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                <tbody>
+                                       <tr>
+                                               <td>
+                                                       <strong><?php _ex( 'All', 'locales', 'rosetta' ); ?></strong>
+                                               </td>
+                                               <td style="text-align:right">
+                                                       <strong><?php echo number_format_i18n( $total_release_counts ); ?></strong>
+                                               </td>
+                                               <td style="text-align:right">
+                                                       <strong><?php echo number_format_i18n( $total_translation_counts ); ?></strong>
+                                               </td>
+                                       </tr>
+                                       <?php echo implode( "\n", $rows ); ?>
+                               </tbody>
+
+                               <tfoot>
+                                       <tr>
+                                               <th scope="col" style="width:80px"><?php _e( 'Locale', 'rosetta' ); ?></th>
+                                               <th scope="col" style="text-align:right"><?php _e( 'Release Package', 'rosetta' ); ?></th>
+                                               <th scope="col" style="text-align:right"><?php _e( 'Language Pack', 'rosetta' ); ?> <abbr title="Since March 11, 2015.">*</abbr></th>
+                                       </tr>
+                               </tfoot>
+                       </table>
+               </div>
+               <?php
+       }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> new Rosetta_Downloads;
</span></span></pre>
</div>
</div>

</body>
</html>