<!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>[43633] trunk: Media: Improve display and accessibility of meta data in detail view.</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/43633">43633</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/43633","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>adamsilverstein</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2018-09-08 04:19:40 +0000 (Sat, 08 Sep 2018)</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'>Media: Improve display and accessibility of meta data in detail view.
* Add a `human_readable_duration` function including tests.
* Add 'pixels' after image width/height.
* Add screen reader text for durations.
Props Presskopp, kiranpotphode, milindmore22, stormrockwell, afercia.
Fixes <a href="https://core.trac.wordpress.org/ticket/39667">#39667</a>. </pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesfunctionsphp">trunk/src/wp-includes/functions.php</a></li>
<li><a href="#trunksrcwpincludesmediatemplatephp">trunk/src/wp-includes/media-template.php</a></li>
<li><a href="#trunksrcwpincludesmediaphp">trunk/src/wp-includes/media.php</a></li>
<li><a href="#trunktestsphpunittestsfunctionsphp">trunk/tests/phpunit/tests/functions.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesfunctionsphp"></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/functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/functions.php 2018-09-06 07:50:29 UTC (rev 43632)
+++ trunk/src/wp-includes/functions.php 2018-09-08 04:19:40 UTC (rev 43633)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -323,6 +323,62 @@
</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><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Convert a filelength to human readable format.
+ *
+ * @since 5.0
+ *
+ * @param string $filelength Duration will be in string format (HH:ii:ss) OR (ii:ss).
+ * @return boolean|string A human readable filelength string, false on failure.
+ */
+function human_readable_duration( $filelength = '' ) {
+ // Return false if filelength is empty or not in format.
+ if ( ( empty( $filelength ) || ! is_string( $filelength ) ) ) {
+ return false;
+ }
+
+ // Validate filelength format.
+ if ( ! ( (bool) preg_match( '/^(([0-3]?[0-9])|([2][0-3])):([0-5]?[0-9])(:([0-5]?[0-9]))?$/', $filelength ) ) ) {
+ return false;
+ }
+
+ $human_readable_duration = array();
+
+ // Extract duration.
+ $durations = array_reverse( explode( ':', $filelength ) );
+ $duration_count = count( $durations );
+
+ if ( 3 === $duration_count ) {
+ // Three parts: hours, minutes & seconds.
+ list( $second, $minute, $hour ) = $durations;
+ } elseif ( 2 === $duration_count ) {
+ // Two parts: minutes & seconds.
+ list( $second, $minute ) = $durations;
+ } else {
+ return false;
+ }
+
+ // Add the hour part to the string.
+ if ( ! empty( $hour ) && is_numeric( $hour ) ) {
+ /* translators: Time duration in hour or hours. */
+ $human_readable_duration[] = sprintf( _n( '%s hour', '%s hours', $hour ), (int) $hour );
+ }
+
+ // Add the minute part to the string.
+ if ( ! empty( $minute ) && is_numeric( $minute ) ) {
+ /* translators: Time duration in minute or minutes. */
+ $human_readable_duration[] = sprintf( _n( '%s minute', '%s minutes', $minute ), (int) $minute );
+ }
+
+ // Add the second part to the string.
+ if ( ! empty( $second ) && is_numeric( $second ) ) {
+ /* translators: Time duration in second or seconds. */
+ $human_readable_duration[] = sprintf( _n( '%s second', '%s seconds', $second ), (int) $second );
+ }
+
+ return implode( ', ', $human_readable_duration );
+}
+
+/**
</ins><span class="cx" style="display: block; padding: 0 10px"> * Get the week start and end from the datetime or date string from MySQL.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 0.71
</span></span></pre></div>
<a id="trunksrcwpincludesmediatemplatephp"></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/media-template.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/media-template.php 2018-09-06 07:50:29 UTC (rev 43632)
+++ trunk/src/wp-includes/media-template.php 2018-09-08 04:19:40 UTC (rev 43633)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -371,12 +371,20 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="file-size"><strong><?php _e( 'File size:' ); ?></strong> {{ data.filesizeHumanReadable }}</div>
</span><span class="cx" style="display: block; padding: 0 10px"> <# if ( 'image' === data.type && ! data.uploading ) { #>
</span><span class="cx" style="display: block; padding: 0 10px"> <# if ( data.width && data.height ) { #>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <div class="dimensions"><strong><?php _e( 'Dimensions:' ); ?></strong> {{ data.width }} × {{ data.height }}</div>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <div class="dimensions"><strong><?php _e( 'Dimensions:' ); ?></strong>
+ <?php
+ /* translators: 1: a number of pixels wide, 2: a number of pixels tall. */
+ printf( __( '%1$s by %2$s pixels' ), '{{ data.width }}', '{{ data.height }}' );
+ ?>
+ </div>
</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">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <# if ( data.fileLength ) { #>
- <div class="file-length"><strong><?php _e( 'Length:' ); ?></strong> {{ data.fileLength }}</div>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <# if ( data.fileLength && data.fileLengthHumanReadable ) { #>
+ <div class="file-length"><strong><?php _e( 'Length:' ); ?></strong>
+ <span aria-hidden="true">{{ data.fileLength }}</span>
+ <span class="screen-reader-text">{{ data.fileLengthHumanReadable }}</span>
+ </div>
</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 ( 'audio' === data.type && data.meta.bitrate ) { #>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -547,7 +555,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="file-size">{{ data.filesizeHumanReadable }}</div>
</span><span class="cx" style="display: block; padding: 0 10px"> <# if ( 'image' === data.type && ! data.uploading ) { #>
</span><span class="cx" style="display: block; padding: 0 10px"> <# if ( data.width && data.height ) { #>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <div class="dimensions">{{ data.width }} × {{ data.height }}</div>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <div class="dimensions">
+ <?php
+ /* translators: 1: a number of pixels wide, 2: a number of pixels tall. */
+ printf( __( '%1$s by %2$s pixels' ), '{{ data.width }}', '{{ data.height }}' );
+ ?>
+ </div>
</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 ( data.can.save && data.sizes ) { #>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -555,8 +568,11 @@
</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">- <# if ( data.fileLength ) { #>
- <div class="file-length"><?php _e( 'Length:' ); ?> {{ data.fileLength }}</div>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <# if ( data.fileLength && data.fileLengthHumanReadable ) { #>
+ <div class="file-length"><?php _e( 'Length:' ); ?>
+ <span aria-hidden="true">{{ data.fileLength }}</span>
+ <span class="screen-reader-text">{{ data.fileLengthHumanReadable }}</span>
+ </div>
</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 ( ! data.uploading && data.can.remove ) { #>
</span></span></pre></div>
<a id="trunksrcwpincludesmediaphp"></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/media.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/media.php 2018-09-06 07:50:29 UTC (rev 43632)
+++ trunk/src/wp-includes/media.php 2018-09-08 04:19:40 UTC (rev 43633)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3378,7 +3378,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $meta && ( 'audio' === $type || 'video' === $type ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $meta['length_formatted'] ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $response['fileLength'] = $meta['length_formatted'];
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $response['fileLength'] = $meta['length_formatted'];
+ $response['fileLengthHumanReadable'] = human_readable_duration( $meta['length_formatted'] );
</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"> $response['meta'] = array();
</span></span></pre></div>
<a id="trunktestsphpunittestsfunctionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/functions.php 2018-09-06 07:50:29 UTC (rev 43632)
+++ trunk/tests/phpunit/tests/functions.php 2018-09-08 04:19:40 UTC (rev 43633)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1518,4 +1518,43 @@
</span><span class="cx" style="display: block; padding: 0 10px"> array( '/leading/relative/path', false ),
</span><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">+
+ /**
+ * Test the human_readable_duration function.
+ *
+ * @ticket 39667
+ * @dataProvider _datahuman_readable_duration()
+ *
+ * @param $input
+ * @param $expected
+ */
+ public function test_duration_format( $input, $expected ) {
+ $this->assertSame( $expected, human_readable_duration( $input ) );
+ }
+
+ public function _datahuman_readable_duration() {
+ return array(
+ array( array(), false ),
+ array( '30:00', '30 minutes, 0 seconds' ),
+ array( 'Batman Begins !', false ),
+ array( '', false ),
+ array( '-1', false ),
+ array( -1, false ),
+ array( 0, false ),
+ array( 1, false ),
+ array( '00', false ),
+ array( '00:00', '0 minutes, 0 seconds' ),
+ array( '00:00:00', '0 hours, 0 minutes, 0 seconds' ),
+ array( '10:30:34', '10 hours, 30 minutes, 34 seconds' ),
+ array( '00:30:34', '0 hours, 30 minutes, 34 seconds' ),
+ array( 'MM:30:00', false ),
+ array( '30:MM', false ),
+ array( 'MM:00', false ),
+ array( 'MM:MM', false ),
+ array( '01:01', '1 minute, 1 second' ),
+ array( '01:01:01', '1 hour, 1 minute, 1 second' ),
+ array( '0:05', '5 seconds' ),
+ array( '1:02:00', '1 hour, 2 minutes, 0 seconds' ),
+ );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre>
</div>
</div>
</body>
</html>