<!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>[4066] sites/trunk/wordpress.org/public_html/wp-content/plugins/support-forums/inc/class-ratings-compat.php: Support Forums: Improve i18n in Ratings_Compat.</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/4066">4066</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/4066","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>coffee2code</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2016-09-14 19:38:37 +0000 (Wed, 14 Sep 2016)</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'>Support Forums: Improve i18n in Ratings_Compat.

Props SergeyBiryukov.
Fixes <a href="http://meta.trac.wordpress.org/ticket/2035">#2035</a>.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginssupportforumsincclassratingscompatphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/support-forums/inc/class-ratings-compat.php</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginssupportforumsincclassratingscompatphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordpress.org/public_html/wp-content/plugins/support-forums/inc/class-ratings-compat.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/plugins/support-forums/inc/class-ratings-compat.php      2016-09-14 19:19:12 UTC (rev 4065)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/support-forums/inc/class-ratings-compat.php        2016-09-14 19:38:37 UTC (rev 4066)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -139,7 +139,15 @@
</span><span class="cx" style="display: block; padding: 0 10px">                        foreach ( array( 5, 4, 3, 2, 1 ) as $rating ) {
</span><span class="cx" style="display: block; padding: 0 10px">                                $ratings_count = isset( $this->ratings_counts[ $rating ] ) ? $this->ratings_counts[ $rating ] : 0;
</span><span class="cx" style="display: block; padding: 0 10px">                                $ratings_count_total = isset( $this->ratings_counts ) ? array_sum( $this->ratings_counts) : 0;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                $stars_title = sprintf( _n( 'Click to see reviews that provided a rating of %d star', 'Click to see reviews that provided a rating of %d stars', $rating, 'wporg-forums' ), $rating );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         $stars_title = sprintf(
+                                       /* translators: %s: number of stars */
+                                       _n( 'Click to see reviews that provided a rating of %d star',
+                                           'Click to see reviews that provided a rating of %d stars',
+                                           $rating,
+                                           'wporg-forums' ),
+                                       $rating
+                               );
+                               /* translators: %d: number of stars */
</ins><span class="cx" style="display: block; padding: 0 10px">                                 $stars_text = sprintf( __( '%d stars', 'wporg-forums' ), $rating );
</span><span class="cx" style="display: block; padding: 0 10px">                                $width = 0;
</span><span class="cx" style="display: block; padding: 0 10px">                                if ( $ratings_count && $ratings_count_total ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -162,7 +170,13 @@
</span><span class="cx" style="display: block; padding: 0 10px">        </div>
</span><span class="cx" style="display: block; padding: 0 10px">        <div class="col-5">
</span><span class="cx" style="display: block; padding: 0 10px">                <div style="font-weight:bold;"><?php _e( 'Average Rating', 'wporg-forums' ); ?></div>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                <?php echo \WPORG_Ratings::get_dashicons_stars( $this->avg_rating ); ?><?php echo sprintf( __( '%s out of <span itemprop="bestRating">5</span> stars', 'wporg-forums' ), round( isset( $this->avg_rating ) ? $this->avg_rating : 0, 1 ) ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         <?php
+                       echo \WPORG_Ratings::get_dashicons_stars( $this->avg_rating );
+                       /* translators: %s: number of stars */
+                       printf( __( '%s out of <span itemprop="bestRating">5</span> stars', 'wporg-forums' ),
+                               round( isset( $this->avg_rating ) ? $this->avg_rating : 0, 1 )
+                       );
+               ?>
</ins><span class="cx" style="display: block; padding: 0 10px">                 <div class="reviews-submit-link">
</span><span class="cx" style="display: block; padding: 0 10px">                <?php
</span><span class="cx" style="display: block; padding: 0 10px">                        if ( is_user_logged_in() ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -172,12 +186,12 @@
</span><span class="cx" style="display: block; padding: 0 10px">                        } else {
</span><span class="cx" style="display: block; padding: 0 10px">                                echo '<span class="reviews-need-login">';
</span><span class="cx" style="display: block; padding: 0 10px">                                printf(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        /* translators: %s: translation of verb string "log in or register" */
-                                       __( 'You must %s to submit a review.', 'wporg-forums' ),
-                                       sprintf(
-                                               '<a href="https://login.wordpress.org/?redirect_to=%s">%s</a>',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 /* translators: %s: login URL */
+                                       __( 'You must <a href="%s">log in or register</a> to submit a review.', 'wporg-forums' ),
+                                       add_query_arg(
+                                               'redirect_to',
</ins><span class="cx" style="display: block; padding: 0 10px">                                                 urlencode( esc_url_raw( sprintf( 'https://wordpress.org/support/%s/%s/reviews/', $this->compat, $this->slug ) ) ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                esc_html_x( 'log in or register', 'verb: You must log in or register to submit a review.', 'wporg-forums' )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                         'https://login.wordpress.org/'
</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">                                echo '</span>';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -192,9 +206,18 @@
</span><span class="cx" style="display: block; padding: 0 10px">        if ( $filter > 0 && $filter < 6 ) {
</span><span class="cx" style="display: block; padding: 0 10px">                echo '<div class="col-9 reviews-filtered-msg" style="font-style:italic;margin-top:24px;">';
</span><span class="cx" style="display: block; padding: 0 10px">                printf(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        _n( 'You are currently viewing the reviews that provided a rating of <strong>%d star</strong>. <a href="%s">Click here</a> to see all reviews.',
-                           'You are currently viewing the reviews that provided a rating of <strong>%d stars</strong>. <a href="%s">Click here</a> to see all reviews.',
-                               'wporg-forums' ), $filter, esc_url ( sprintf( '//wordpress.org/support/%s/%s/reviews/', $this->compat, $this->slug ) ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 /* translators: %d: number of stars */
+                       _n( 'You are currently viewing the reviews that provided a rating of <strong>%d star</strong>.',
+                           'You are currently viewing the reviews that provided a rating of <strong>%d stars</strong>.',
+                $filter,
+                'wporg-forums' ),
+                       $filter
+               );
+               printf(
+                       /* translators: %s: plugin/theme reviews URL */
+                       __( '<a href="%s">Click here</a> to see all reviews.', 'wporg-forums' ),
+                       esc_url( sprintf( '//wordpress.org/support/%s/%s/reviews/', $this->compat, $this->slug ) )
+               );
</ins><span class="cx" style="display: block; padding: 0 10px">                 echo "</div>\n";
</span><span class="cx" style="display: block; padding: 0 10px">        }
</span><span class="cx" style="display: block; padding: 0 10px">        ?>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -228,12 +251,12 @@
</span><span class="cx" style="display: block; padding: 0 10px">                if ( ! is_user_logged_in() ) {
</span><span class="cx" style="display: block; padding: 0 10px">                        echo '<p>';
</span><span class="cx" style="display: block; padding: 0 10px">                        printf(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                /* translators: %s: translation of verb string "log in or register" */
-                               __( 'You must %s to submit a review.', 'wporg-forums' ),
-                               sprintf(
-                                       '<a href="https://login.wordpress.org/?redirect_to=%s">%s</a>',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         /* translators: %s: login URL */
+                               __( 'You must <a href="%s">log in or register</a> to submit a review.', 'wporg-forums' ),
+                               add_query_arg(
+                                       'redirect_to',
</ins><span class="cx" style="display: block; padding: 0 10px">                                         urlencode( esc_url_raw( sprintf( 'https://wordpress.org/support/%s/%s/reviews/', $this->compat, $this->slug ) ) ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        esc_html_x( 'log in or register', 'verb: You must log in or register to submit a review.', 'wporg-forums' )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 'https://login.wordpress.org/'
</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">                        echo '</p>';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -267,21 +290,20 @@
</span><span class="cx" style="display: block; padding: 0 10px">                $report = $rate = '';
</span><span class="cx" style="display: block; padding: 0 10px">                switch( $this->compat ) {
</span><span class="cx" style="display: block; padding: 0 10px">                        case 'plugin' :
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                $report = __( 'If you are reporting an issue with this plugin, please post %s instead.', 'wporg-forums' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         /* translators: %s: plugin support forum URL */
+                               $report = __( 'If you are reporting an issue with this plugin, please post <a href="%s">here</a> instead.', 'wporg-forums' );
</ins><span class="cx" style="display: block; padding: 0 10px">                                 $rate   = __( 'In order to rate a plugin, you must also submit a review.', 'wporg-forums' );
</span><span class="cx" style="display: block; padding: 0 10px">                                break;
</span><span class="cx" style="display: block; padding: 0 10px">                        case 'theme' :
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                $report = __( 'If you are reporting an issue with this theme, please post %s instead.', 'wporg-forums' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         /* translators: %s: theme support forum URL */
+                               $report = __( 'If you are reporting an issue with this theme, please post <a href="%s">here</a> instead.', 'wporg-forums' );
</ins><span class="cx" style="display: block; padding: 0 10px">                                 $rate   = __( 'In order to rate a theme, you must also submit a review.', 'wporg-forums' );
</span><span class="cx" style="display: block; padding: 0 10px">                                break;
</span><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">                <p><?php _e( 'When posting a review, follow these guidelines:', 'wporg-forums' ); ?></p>
</span><span class="cx" style="display: block; padding: 0 10px">                <ul>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        <li><?php printf( esc_html( $report ), sprintf( '<a href="%s">%s</a>',
-                                       esc_url( sprintf( 'https://wordpress.org/support/%s/%s/', $this->compat, $this->slug ) ),
-                                       _x( 'here', 'please post here instead', 'wporg-forums' )
-                               ) ); ?></li>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 <li><?php printf( esc_html( $report ), esc_url( sprintf( 'https://wordpress.org/support/%s/%s/', $this->compat, $this->slug ) ) ); ?></li>
</ins><span class="cx" style="display: block; padding: 0 10px">                         <li><?php echo esc_html( $rate ); ?></li>
</span><span class="cx" style="display: block; padding: 0 10px">                        <li><?php esc_html_e( 'Please provide as much detail as you can to justify your rating and to help others.', 'wporg-forums' ); ?></li>
</span><span class="cx" style="display: block; padding: 0 10px">                </ul>
</span></span></pre>
</div>
</div>

</body>
</html>