<!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>[26704] trunk/src/wp-admin/includes/dashboard.php: Fix various i18n issues on the dashboard.</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">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/26704">26704</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2013-12-05 23:33:48 +0000 (Thu, 05 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix various i18n issues on the dashboard. Limits it to posts and pages only for 3.8.
props SergeyBiryukov, dimadin.
fixes <a href="http://core.trac.wordpress.org/ticket/26066">#26066</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminincludesdashboardphp">trunk/src/wp-admin/includes/dashboard.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminincludesdashboardphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/includes/dashboard.php (26703 => 26704)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/includes/dashboard.php 2013-12-05 23:13:22 UTC (rev 26703)
+++ trunk/src/wp-admin/includes/dashboard.php 2013-12-05 23:33:48 UTC (rev 26704)
</span><span class="lines">@@ -185,36 +185,32 @@
</span><span class="cx"> <ul>
</span><span class="cx"> <?php
</span><span class="cx"> do_action( 'rightnow_list_start' );
</span><del>- // Using show_in_nav_menus as my arg for grabbing what post types should show, is there better?
- $post_types = get_post_types( array( 'show_in_nav_menus' => true ), 'objects' );
- $post_types = (array) apply_filters( 'rightnow_post_types', $post_types );
- foreach ( $post_types as $post_type => $post_type_obj ){
</del><ins>+ // Posts and Pages
+ foreach ( array( 'post', 'page' ) as $post_type ) {
</ins><span class="cx"> $num_posts = wp_count_posts( $post_type );
</span><span class="cx"> if ( $num_posts && $num_posts->publish ) {
</span><del>- printf(
- '<li class="%1$s-count"><a href="edit.php?post_type=%1$s">%2$s %3$s</a></li>',
- $post_type,
- number_format_i18n( $num_posts->publish ),
- $post_type_obj->label
- );
</del><ins>+ if ( 'post' == $post_type ) {
+ $text = _n( '%s Post', '%s Posts', $num_posts->publish );
+ } else {
+ $text = _n( '%s Page', '%s Pages', $num_posts->publish );
+ }
+ $text = sprintf( $text, number_format_i18n( $num_posts->publish ) );
+ printf( '<li class="%1$s-count"><a href="edit.php?post_type=%1$s">%2$s</a></li>', $post_type, $text );
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> // Comments
</span><span class="cx"> $num_comm = wp_count_comments();
</span><span class="cx"> if ( $num_comm && $num_comm->total_comments ) {
</span><del>- $text = _n( 'comment', 'comments', $num_comm->total_comments );
- printf(
- '<li class="comment-count"><a href="edit-comments.php">%1$s %2$s</a></li>',
- number_format_i18n( $num_comm->total_comments ),
- $text
- );
</del><ins>+ $text = sprintf( _n( '%s Comment', '%s Comments', $num_comm->total_comments ), number_format_i18n( $num_comm->total_comments ) );
+ ?>
+ <li class="comment-count"><a href="edit-comments.php"><?php echo $text; ?></a></li>
+ <?php
</ins><span class="cx"> if ( $num_comm->moderated ) {
</span><del>- $text = _n( 'in moderation', 'in moderation', $num_comm->total_comments );
- printf(
- '<li class="comment-mod-count"><a href="edit-comments.php?comment_status=moderated">%1$s %2$s</a></li>',
- number_format_i18n( $num_comm->moderated ),
- $text
- );
</del><ins>+ /* translators: Number of comments in moderation */
+ $text = sprintf( _nx( '%s in moderation', '%s in moderation', $num_comm->moderated, 'comments' ), number_format_i18n( $num_comm->moderated ) );
+ ?>
+ <li class="comment-mod-count"><a href="edit-comments.php?comment_status=moderated"><?php echo $text; ?></a></li>
+ <?php
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> do_action( 'rightnow_list_end' );
</span><span class="lines">@@ -588,17 +584,19 @@
</span><span class="cx"> } elseif ( date( 'Y-m-d', $time ) == $tomorrow ) {
</span><span class="cx"> $relative = __( 'Tomorrow' );
</span><span class="cx"> } else {
</span><del>- $relative = date( 'M jS', $time );
</del><ins>+ $relative = date_i18n( __( 'M jS' ), $time );
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- printf(
- '<li%s><span>%s, %s</span> <a href="%s">%s</a></li>',
- ( $i >= intval ( $args['display'] ) ? ' class="hidden"' : '' ),
- $relative,
- get_the_time(),
- get_edit_post_link(),
- _draft_or_post_title()
- );
</del><ins>+ $text = sprintf(
+ /* translators: 1: relative date, 2: time, 4: post title */
+ __( '<span>%1$s, %2$s</span> <a href="%3$s">%4$s</a>' ),
+ $relative,
+ get_the_time(),
+ get_edit_post_link(),
+ _draft_or_post_title()
+ );
+
+ $hidden = $i > $args['display'] ? ' class="hidden"' : '';
</ins><span class="cx"> $i++;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -966,21 +964,29 @@
</span><span class="cx"> <div class="mu-storage">
</span><span class="cx"> <ul>
</span><span class="cx"> <li class="storage-count">
</span><del>- <?php printf(
- '<a href="%1$s" title="%3$s">%2$sMB %4$s</a>',
</del><ins>+ <?php $text = sprintf(
+ /* translators: number of megabytes */
+ __( '%s MB Space Allowed' ),
+ number_format_i18n( $quota )
+ );
+ printf(
+ '<a href="%1$s" title="%2$s">%3$s</a>',
</ins><span class="cx"> esc_url( admin_url( 'upload.php' ) ),
</span><del>- number_format_i18n( $quota ),
</del><span class="cx"> __( 'Manage Uploads' ),
</span><del>- __( 'Space Allowed' )
</del><ins>+ $text
</ins><span class="cx"> ); ?>
</span><span class="cx"> </li><li class="storage-count <?php echo $used_class; ?>">
</span><del>- <?php printf(
- '<a href="%1$s" title="%4$s" class="musublink">%2$sMB (%3$s%%) %5$s</a>',
</del><ins>+ <?php $text = sprintf(
+ /* translators: 1: number of megabytes, 2: percentage */
+ __( '%1$s MB (%2$s%%) Space Used' ),
+ number_format_i18n( $used, 2 ),
+ $percentused
+ );
+ printf(
+ '<a href="%1$s" title="%2$s" class="musublink">%3$s</a>',
</ins><span class="cx"> esc_url( admin_url( 'upload.php' ) ),
</span><del>- number_format_i18n( $used, 2 ),
- $percentused,
</del><span class="cx"> __( 'Manage Uploads' ),
</span><del>- __( 'Space Used' )
</del><ins>+ $text
</ins><span class="cx"> ); ?>
</span><span class="cx"> </li>
</span><span class="cx"> </ul>
</span></span></pre>
</div>
</div>
</body>
</html>