Changeset 46863

Timestamp:

12/09/2019 07:00:18 PM (7 years ago)

Author:

SergeyBiryukov

Message:

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.
Merges [46862] to the 5.3 branch.
Fixes #48606.

Location:

branches/5.3

Files:

• . (modified) (1 prop)
• src/wp-includes/functions.php (modified) (2 diffs)
• tests/phpunit/tests/functions/maybeDeclineDate.php (modified) (4 diffs)

branches/5.3/src/wp-includes/functions.php

@@ -336 +336 @@
                 $months_genitive = $wp_locale->month_genitive;
 
-                // Match a format like 'j F Y' or 'j. F'
-                if ( preg_match( '#^\d{1,2}\.? [^\d ]+#u', $date ) ) {
-
+                /*
+                 * 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 ) ) {
                         foreach ( $months as $key => $month ) {
-                                $months[ $key ] = '# ' . $month . '( |$)#u';
+                                $months[ $key ] = '# ' . preg_quote( $month, '#' ) . '\b#u';
                         }
 
                         foreach ( $months_genitive as $key => $month ) {
-                                $months_genitive[ $key ] = ' ' . $month . '$1';
+                                $months_genitive[ $key ] = ' ' . $month;
                         }
 
@@ -350 +352 @@
                 }
 
-                // 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 ) ) ) {
+                /*
+                 * 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 ) ) ) {
                         foreach ( $months as $key => $month ) {
-                                $months[ $key ] = '#' . $month . ' (\d{1,2})(st|nd|rd|th)?#u';
+                                $months[ $key ] = '#\b' . preg_quote( $month, '#' ) . ' (\d{1,2})(st|nd|rd|th)?\b#u';
                         }
 

branches/5.3/tests/phpunit/tests/functions/maybeDeclineDate.php

@@ -38 +38 @@
         /**
          * @ticket 36790
+         * @ticket 37411
+         * @ticket 48606
          * @dataProvider data_wp_maybe_decline_date
          */
@@ -72 +74 @@
                         array( 'ru_RU', 'Январь 1st 2016', '1 января 2016' ),
                         array( 'ru_RU', 'Январь 1 2016', '1 января 2016' ),
+                        array( 'ru_RU', 'Январь 1 16', '1 января 16' ),
+                        array( 'ru_RU', 'Суббота, 19 Январь 2019 10:50', 'Суббота, 19 января 2019 10:50' ),
                         array( 'pl_PL', '1 Styczeń', '1 stycznia' ),
                         array( 'hr', '1. Siječanj', '1. siječnja' ),
@@ -77 +81 @@
                         array( 'cs_CZ', '1. Červen', '1. června' ),
                         array( 'cs_CZ', '1. Červenec', '1. července' ),
+                        array( 'it_IT', 'Lundeì 11 Novembre 2019', 'Lundeì 11 Novembre 2019' ),
+                        array( 'el', 'Σάββατο, 19 Ιανουάριος 2019 10:50', 'Σάββατο, 19 Ιανουαρίου 2019 10:50' ),
                 );
         }
@@ -117 +123 @@
                                 break;
 
+                        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;
+
                         default:
                                 $months = array(