<!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>[58600] trunk: Date/Time: Replace abbreviations for minutes in `human_time_diff()`.</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/58600">58600</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/58600","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>2024-06-29 09:29:08 +0000 (Sat, 29 Jun 2024)</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'>Date/Time: Replace abbreviations for minutes in `human_time_diff()`.
This ensures that relative times are formatted the same way in both JS and PHP.
Follow-up to <a href="https://core.trac.wordpress.org/changeset/1976">[1976]</a>, <a href="https://core.trac.wordpress.org/changeset/2124">[2124]</a>, <a href="https://core.trac.wordpress.org/changeset/4658">[4658]</a>, <a href="https://core.trac.wordpress.org/changeset/41018">[41018]</a>, <a href="https://core.trac.wordpress.org/changeset/56496">[56496]</a>.
Props wildworks.
Fixes <a href="https://core.trac.wordpress.org/ticket/61535">#61535</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesformattingphp">trunk/src/wp-includes/formatting.php</a></li>
<li><a href="#trunktestsphpunittestsformattinghumanTimeDiffphp">trunk/tests/phpunit/tests/formatting/humanTimeDiff.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesformattingphp"></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/formatting.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/formatting.php 2024-06-28 19:08:53 UTC (rev 58599)
+++ trunk/src/wp-includes/formatting.php 2024-06-29 09:29:08 UTC (rev 58600)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3856,7 +3856,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Determines the difference between two timestamps.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * The difference is returned in a human-readable format such as "1 hour",
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * "5 mins", "2 days".
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * "5 minutes", "2 days".
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 1.5.0
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 5.3.0 Added support for showing a difference in seconds.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3885,7 +3885,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $mins = 1;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: Time difference between two dates, in minutes (min=minute). %s: Number of minutes. */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $since = sprintf( _n( '%s min', '%s mins', $mins ), $mins );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $since = sprintf( _n( '%s minutes', '%s minutes', $mins ), $mins );
</ins><span class="cx" style="display: block; padding: 0 10px"> } elseif ( $diff < DAY_IN_SECONDS && $diff >= HOUR_IN_SECONDS ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $hours = round( $diff / HOUR_IN_SECONDS );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $hours <= 1 ) {
</span></span></pre></div>
<a id="trunktestsphpunittestsformattinghumanTimeDiffphp"></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/formatting/humanTimeDiff.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/formatting/humanTimeDiff.php 2024-06-28 19:08:53 UTC (rev 58599)
+++ trunk/tests/phpunit/tests/formatting/humanTimeDiff.php 2024-06-29 09:29:08 UTC (rev 58600)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -27,7 +27,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'Test a difference of 37 seconds.',
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- '5 mins',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ '5 minutes',
</ins><span class="cx" style="display: block; padding: 0 10px"> new DateTime( '2016-01-01 12:05:00' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'Test a difference of 5 minutes.',
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span></span></pre>
</div>
</div>
</body>
</html>