Ticket #37411: wp-maybe-decline-date.patch

src/wp-includes/functions.php

@@ -219 +219 @@
          * translate this to 'on'. Do not translate into your own language.
          */
         if ( 'on' === _x( 'off', 'decline months names: on or off' ) ) {
-                // 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;
+
+                $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 ) ) {
+
                         foreach ( $months as $key => $month ) {
                                 $months[ $key ] = '# ' . $month . '( |$)#u';
                         }
@@ -232 +234 @@
                                 $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;
+                        }
+
                         $date = preg_replace( $months, $months_genitive, $date );
                 }
         }

tests/phpunit/tests/functions/maybeDeclineDate.php

@@ -3 +3 @@
 /**
  * @group functions.php
  * @group i18n
+ * @group datetime
  */
 class Tests_Functions_MaybeDeclineDate extends WP_UnitTestCase {
 
@@ -68 +69 @@
                 return array(
                         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' ),
                         array( 'ca', '1 de abril', "1 d'abril" ),