<!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>[46083] trunk/src: Accessibility: Posts, Post Types: Replace `@` with `at` in the displayed date format.</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 { white-space: pre-line; 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="https://core.trac.wordpress.org/changeset/46083">46083</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/46083","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>SergeyBiryukov</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2019-09-08 23:23:26 +0000 (Sun, 08 Sep 2019)</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'>Accessibility: Posts, Post Types: Replace `@` with `at` in the displayed date format.
The `@` symbol makes sense in the context of email addresses, but does not have a universal meaning in the context of dates.
Props birgire, afercia, audrasjb, SergeyBiryukov.
Fixes <a href="https://core.trac.wordpress.org/ticket/47832">#47832</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadmineditformadvancedphp">trunk/src/wp-admin/edit-form-advanced.php</a></li>
<li><a href="#trunksrcwpadminincludesmetaboxesphp">trunk/src/wp-admin/includes/meta-boxes.php</a></li>
<li><a href="#trunksrcwpadminincludestemplatephp">trunk/src/wp-admin/includes/template.php</a></li>
<li><a href="#trunksrcwpincludesscriptloaderphp">trunk/src/wp-includes/script-loader.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadmineditformadvancedphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/edit-form-advanced.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/edit-form-advanced.php 2019-09-08 13:15:19 UTC (rev 46082)
+++ trunk/src/wp-admin/edit-form-advanced.php 2019-09-08 23:23:26 UTC (rev 46083)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -166,8 +166,14 @@
</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">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/* translators: Publish box date format, see https://secure.php.net/date */
-$scheduled_date = date_i18n( __( 'M j, Y @ H:i' ), strtotime( $post->post_date ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+$scheduled_date = sprintf(
+ /* translators: Publish box date string. 1: Date, 2: Time. */
+ __( '%1$s at %2$s' ),
+ /* translators: Publish box date format, see https://secure.php.net/date */
+ date_i18n( _x( 'M j, Y', 'publish box date format' ), strtotime( $post->post_date ) ),
+ /* translators: Publish box time format, see https://secure.php.net/date */
+ date_i18n( _x( 'H:i', 'publish box time format' ), strtotime( $post->post_date ) )
+);
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $messages['post'] = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 0 => '', // Unused. Messages start at index 1.
</span></span></pre></div>
<a id="trunksrcwpadminincludesmetaboxesphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/meta-boxes.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/meta-boxes.php 2019-09-08 13:15:19 UTC (rev 46082)
+++ trunk/src/wp-admin/includes/meta-boxes.php 2019-09-08 23:23:26 UTC (rev 46083)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -194,28 +194,41 @@
</span><span class="cx" style="display: block; padding: 0 10px"> </div><!-- .misc-pub-section -->
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: Publish box date string. 1: Date, 2: Time. See https://secure.php.net/date */
+ $date_string = __( '%1$s at %2$s' );
</ins><span class="cx" style="display: block; padding: 0 10px"> /* translators: Publish box date format, see https://secure.php.net/date */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $datef = __( 'M j, Y @ H:i' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $date_format = _x( 'M j, Y', 'publish box date format' );
+ /* translators: Publish box time format, see https://secure.php.net/date */
+ $time_format = _x( 'H:i', 'publish box time format' );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( 0 != $post->ID ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'future' == $post->post_status ) { // scheduled for publishing at a future date
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: Post date information. %s: Date on which the post is currently scheduled to be published. */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $stamp = __( 'Scheduled for: <b>%s</b>' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $stamp = __( 'Scheduled for: %s' );
</ins><span class="cx" style="display: block; padding: 0 10px"> } elseif ( 'publish' == $post->post_status || 'private' == $post->post_status ) { // already published
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: Post date information. %s: Date on which the post was published. */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $stamp = __( 'Published on: <b>%s</b>' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $stamp = __( 'Published on: %s' );
</ins><span class="cx" style="display: block; padding: 0 10px"> } elseif ( '0000-00-00 00:00:00' == $post->post_date_gmt ) { // draft, 1 or more saves, no date specified
</span><span class="cx" style="display: block; padding: 0 10px"> $stamp = __( 'Publish <b>immediately</b>' );
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( time() < strtotime( $post->post_date_gmt . ' +0000' ) ) { // draft, 1 or more saves, future date specified
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: Post date information. %s: Date on which the post is to be published. */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $stamp = __( 'Schedule for: <b>%s</b>' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $stamp = __( 'Schedule for: %s' );
</ins><span class="cx" style="display: block; padding: 0 10px"> } else { // draft, 1 or more saves, date specified
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: Post date information. %s: Date on which the post is to be published. */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $stamp = __( 'Publish on: <b>%s</b>' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $stamp = __( 'Publish on: %s' );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $date = date_i18n( $datef, strtotime( $post->post_date ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $date = sprintf(
+ $date_string,
+ date_i18n( $date_format, strtotime( $post->post_date ) ),
+ date_i18n( $time_format, strtotime( $post->post_date ) )
+ );
</ins><span class="cx" style="display: block; padding: 0 10px"> } else { // draft (no saves, and thus no date specified)
</span><span class="cx" style="display: block; padding: 0 10px"> $stamp = __( 'Publish <b>immediately</b>' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $date = date_i18n( $datef, strtotime( current_time( 'mysql' ) ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $date = sprintf(
+ $date_string,
+ date_i18n( $date_format, strtotime( current_time( 'mysql' ) ) ),
+ date_i18n( $time_format, strtotime( current_time( 'mysql' ) ) )
+ );
</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"> if ( ! empty( $args['args']['revisions_count'] ) ) :
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -234,10 +247,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="misc-pub-section curtime misc-pub-curtime">
</span><span class="cx" style="display: block; padding: 0 10px"> <span id="timestamp">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php printf( $stamp, $date ); ?></span>
- <a href="#edit_timestamp" class="edit-timestamp hide-if-no-js" role="button"><span aria-hidden="true"><?php _e( 'Edit' ); ?></span> <span class="screen-reader-text"><?php _e( 'Edit date and time' ); ?></span></a>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php printf( $stamp, '<b>' . $date . '</b>' ); ?>
+ </span>
+ <a href="#edit_timestamp" class="edit-timestamp hide-if-no-js" role="button">
+ <span aria-hidden="true"><?php _e( 'Edit' ); ?></span>
+ <span class="screen-reader-text"><?php _e( 'Edit date and time' ); ?></span>
+ </a>
</ins><span class="cx" style="display: block; padding: 0 10px"> <fieldset id="timestampdiv" class="hide-if-js">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <legend class="screen-reader-text"><?php _e( 'Date and time' ); ?></legend>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <legend class="screen-reader-text"><?php _e( 'Date and time' ); ?></legend>
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php touch_time( ( $action === 'edit' ), 1 ); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </fieldset>
</span><span class="cx" style="display: block; padding: 0 10px"> </div><?php // /misc-pub-section ?>
</span></span></pre></div>
<a id="trunksrcwpadminincludestemplatephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/template.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/template.php 2019-09-08 13:15:19 UTC (rev 46082)
+++ trunk/src/wp-admin/includes/template.php 2019-09-08 23:23:26 UTC (rev 46083)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -824,7 +824,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> echo '<div class="timestamp-wrap">';
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: 1: Month, 2: Day, 3: Year, 4: Hour, 5: Minute. */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- printf( __( '%1$s %2$s, %3$s @ %4$s:%5$s' ), $month, $day, $year, $hour, $minute );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ printf( __( '%1$s %2$s, %3$s at %4$s:%5$s' ), $month, $day, $year, $hour, $minute );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> echo '</div><input type="hidden" id="ss" name="ss" value="' . $ss . '" />';
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpincludesscriptloaderphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/script-loader.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/script-loader.php 2019-09-08 13:15:19 UTC (rev 46082)
+++ trunk/src/wp-includes/script-loader.php 2019-09-08 23:23:26 UTC (rev 46083)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1583,7 +1583,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'publishOnFuture' => __( 'Schedule for:' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'publishOnPast' => __( 'Published on:' ),
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: 1: Month, 2: Day, 3: Year, 4: Hour, 5: Minute. */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'dateFormat' => __( '%1$s %2$s, %3$s @ %4$s:%5$s' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'dateFormat' => __( '%1$s %2$s, %3$s at %4$s:%5$s' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'showcomm' => __( 'Show more comments' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'endcomm' => __( 'No more comments found.' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'publish' => __( 'Publish' ),
</span></span></pre>
</div>
</div>
</body>
</html>