Changeset 45555

Timestamp:

06/20/2019 01:46:20 PM (5 years ago)

Author:

SergeyBiryukov

Message:

Date/Time: Add more supported formats to wp_maybe_decline_date().

Props SergeyBiryukov, Rarst.
Fixes #37411.

Location:

trunk

Files:

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

trunk/src/wp-includes/functions.php

@@ -220 +220 @@
      */
     if ( 'on' === _x( 'off', 'decline months names: on or off' ) ) {
+
+        $months          = $wp_locale->month;
+        $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 ) ) {
-            $months          = $wp_locale->month;
-            $months_genitive = $wp_locale->month_genitive;
 
             foreach ( $months as $key => $month ) {
@@ -231 +233 @@
             foreach ( $months_genitive as $key => $month ) {
                 $months_genitive[ $key ] = ' ' . $month . '$1';
+            }
+
+            $date = preg_replace( $months, $months_genitive, $date );
+        }
+
+        // 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 ) ) ) {
+            foreach ( $months as $key => $month ) {
+                $months[ $key ] = '#' . $month . ' (\d{1,2})(st|nd|rd|th)?#u';
+            }
+
+            foreach ( $months_genitive as $key => $month ) {
+                $months_genitive[ $key ] = '$1 ' . $month;
             }
 

trunk/tests/phpunit/tests/functions/maybeDeclineDate.php

@@ -4 +4 @@
  * @group functions.php
  * @group i18n
+ * @group datetime
  */
 class Tests_Functions_MaybeDeclineDate extends WP_UnitTestCase {
@@ -69 +70 @@
             array( 'ru_RU', '21 Июнь', '21 июня' ),
             array( 'ru_RU', '1 Январь 2016', '1 января 2016' ),
+            array( 'ru_RU', 'Январь 1st 2016', '1 января 2016' ),
+            array( 'ru_RU', 'Январь 1 2016', '1 января 2016' ),
             array( 'pl_PL', '1 Styczeń', '1 stycznia' ),
             array( 'hr', '1. Siječanj', '1. siječnja' ),