<!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>[46862] trunk: Date/Time: When determining whether to decline the month name in `wp_maybe_decline_date()`, take word boundaries into account.</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/46862">46862</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/46862","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-12-09 18:48:50 +0000 (Mon, 09 Dec 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'>Date/Time: When determining whether to decline the month name in `wp_maybe_decline_date()`, take word boundaries into account.
Add more unit tests.
Props Rarst, Clorith, timon33, Xendo, SergeyBiryukov.
Fixes <a href="https://core.trac.wordpress.org/ticket/48606">#48606</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesfunctionsphp">trunk/src/wp-includes/functions.php</a></li>
<li><a href="#trunktestsphpunittestsfunctionsmaybeDeclineDatephp">trunk/tests/phpunit/tests/functions/maybeDeclineDate.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 2019-12-09 17:40:16 UTC (rev 46861)
+++ trunk/src/wp-includes/functions.php 2019-12-09 18:48:50 UTC (rev 46862)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -335,24 +335,29 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $months = $wp_locale->month;
</span><span class="cx" style="display: block; padding: 0 10px"> $months_genitive = $wp_locale->month_genitive;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Match a format like 'j F Y' or 'j. F'
- if ( preg_match( '#^\d{1,2}\.? [^\d ]+#u', $date ) ) {
-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*
+ * Match a format like 'j F Y' or 'j. F' (day of the month, followed by month name)
+ * and decline the month.
+ */
+ if ( preg_match( '#\b\d{1,2}\.? [^\d ]+\b#u', $date ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> foreach ( $months as $key => $month ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $months[ $key ] = '# ' . $month . '( |$)#u';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $months[ $key ] = '# ' . preg_quote( $month, '#' ) . '\b#u';
</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"> foreach ( $months_genitive as $key => $month ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $months_genitive[ $key ] = ' ' . $month . '$1';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $months_genitive[ $key ] = ' ' . $month;
</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"> $date = preg_replace( $months, $months_genitive, $date );
</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">- // Match a format like 'F jS' or 'F j' and change it to 'j F'
- if ( preg_match( '#^[^\d ]+ \d{1,2}(st|nd|rd|th)? #u', trim( $date ) ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*
+ * Match a format like 'F jS' or 'F j' (month name, followed by day with an optional ordinal suffix)
+ * and change it to declined 'j F'.
+ */
+ if ( preg_match( '#\b[^\d ]+ \d{1,2}(st|nd|rd|th)?\b#u', trim( $date ) ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> foreach ( $months as $key => $month ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $months[ $key ] = '#' . $month . ' (\d{1,2})(st|nd|rd|th)?#u';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $months[ $key ] = '#\b' . preg_quote( $month, '#' ) . ' (\d{1,2})(st|nd|rd|th)?\b#u';
</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"> foreach ( $months_genitive as $key => $month ) {
</span></span></pre></div>
<a id="trunktestsphpunittestsfunctionsmaybeDeclineDatephp"></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/maybeDeclineDate.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/functions/maybeDeclineDate.php 2019-12-09 17:40:16 UTC (rev 46861)
+++ trunk/tests/phpunit/tests/functions/maybeDeclineDate.php 2019-12-09 18:48:50 UTC (rev 46862)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -37,6 +37,8 @@
</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"> * @ticket 36790
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @ticket 37411
+ * @ticket 48606
</ins><span class="cx" style="display: block; padding: 0 10px"> * @dataProvider data_wp_maybe_decline_date
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_wp_maybe_decline_date( $test_locale, $input, $output ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -71,11 +73,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> array( 'ru_RU', '1 Январь 2016', '1 января 2016' ),
</span><span class="cx" style="display: block; padding: 0 10px"> array( 'ru_RU', 'Январь 1st 2016', '1 января 2016' ),
</span><span class="cx" style="display: block; padding: 0 10px"> array( 'ru_RU', 'Январь 1 2016', '1 января 2016' ),
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ array( 'ru_RU', 'Январь 1 16', '1 января 16' ),
+ array( 'ru_RU', 'Суббота, 19 Январь 2019 10:50', 'Суббота, 19 января 2019 10:50' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> array( 'pl_PL', '1 Styczeń', '1 stycznia' ),
</span><span class="cx" style="display: block; padding: 0 10px"> array( 'hr', '1. Siječanj', '1. siječnja' ),
</span><span class="cx" style="display: block; padding: 0 10px"> array( 'ca', '1 de abril', "1 d'abril" ),
</span><span class="cx" style="display: block; padding: 0 10px"> array( 'cs_CZ', '1. Červen', '1. června' ),
</span><span class="cx" style="display: block; padding: 0 10px"> array( 'cs_CZ', '1. Červenec', '1. července' ),
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ array( 'it_IT', 'Lundeì 11 Novembre 2019', 'Lundeì 11 Novembre 2019' ),
+ array( 'el', 'Σάββατο, 19 Ιανουάριος 2019 10:50', 'Σάββατο, 19 Ιανουαρίου 2019 10:50' ),
</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><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -116,6 +122,20 @@
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ case 'it_IT':
+ $months = array(
+ 'month' => array( 'Gennaio', 'Febbraio', 'Marzo', 'Aprile', 'Maggio', 'Giugno', 'Luglio', 'Agosto', 'Settembre', 'Ottobre', 'Novembre', 'Dicembre' ),
+ 'month_genitive' => array( 'Gennaio', 'Febbraio', 'Marzo', 'Aprile', 'Maggio', 'Giugno', 'Luglio', 'Agosto', 'Settembre', 'Ottobre', 'Novembre', 'Dicembre' ),
+ );
+ break;
+
+ case 'el':
+ $months = array(
+ 'month' => array( 'Ιανουάριος', 'Φεβρουάριος', 'Μάρτιος', 'Απρίλιος', 'Μάιος', 'Ιούνιος', 'Ιούλιος', 'Αύγουστος', 'Σεπτέμβριος', 'Οκτώβριος', 'Νοέμβριος', 'Δεκέμβριος' ),
+ 'month_genitive' => array( 'Ιανουαρίου', 'Φεβρουαρίου', 'Μαρτίου', 'Απριλίου', 'Μαΐου', 'Ιουνίου', 'Ιουλίου', 'Αυγούστου', 'Σεπτεμβρίου', 'Οκτωβρίου', 'Νοεμβρίου', 'Δεκεμβρίου' ),
+ );
+ break;
+
</ins><span class="cx" style="display: block; padding: 0 10px"> default:
</span><span class="cx" style="display: block; padding: 0 10px"> $months = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'month' => array( 'January', 'February', 'March', 'April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', 'December' ),
</span></span></pre>
</div>
</div>
</body>
</html>