Changeset 47098

Timestamp:

01/21/2020 11:46:36 PM (7 years ago)

Author:

SergeyBiryukov

Message:

Date/Time: In wp_maybe_decline_date(), add support for a range of days, e.g. February 21–23.

A potential use case is displaying multi-day events in the WordPress Events and News dashboard widget.

See #47798, #48934.

Location:

trunk

Files:

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

trunk/src/wp-includes/functions.php

@@ -374 +374 @@
                 if ( $decline ) {
                         foreach ( $months as $key => $month ) {
-                                $months[ $key ] = '#\b' . preg_quote( $month, '#' ) . ' (\d{1,2})(st|nd|rd|th)?\b#u';
+                                $months[ $key ] = '#\b' . preg_quote( $month, '#' ) . ' (\d{1,2})(st|nd|rd|th)?([-–]\d{1,2})?(st|nd|rd|th)?\b#u';
                         }
 
                         foreach ( $months_genitive as $key => $month ) {
-                                $months_genitive[ $key ] = '$1 ' . $month;
+                                $months_genitive[ $key ] = '$1$3 ' . $month;
                         }
 

trunk/tests/phpunit/tests/date/maybeDeclineDate.php

@@ -40 +40 @@
          * @ticket 37411
          * @ticket 48606
+         * @ticket 48934
          * @dataProvider data_wp_maybe_decline_date
          */
@@ -74 +75 @@
                         array( 'ru_RU', 'F jS Y', 'Январь 1st 2016', '1 января 2016' ),
                         array( 'ru_RU', 'F j Y', 'Январь 1 2016', '1 января 2016' ),
+                        array( 'ru_RU', 'F j–j Y', 'Январь 1–2 2016', '1–2 января 2016' ),
                         array( 'ru_RU', 'F j y', 'Январь 1 16', '1 января 16' ),
                         array( 'ru_RU', 'F y', 'Январь 16', 'Январь 16' ),