WordPress.org

Make WordPress Core

Ticket #33397: 33397.2.patch

File 33397.2.patch, 2.4 KB (added by egill, 4 years ago)
  • src/wp-includes/class-wp-customize-nav-menus.php

     
    467467                // Menu loactions.
    468468                $locations     = get_registered_nav_menus();
    469469                $num_locations = count( array_keys( $locations ) );
    470                 $description   = '<p>' . sprintf( _n( 'Your theme contains %s menu location. Select which menu you would like to use.', 'Your theme contains %s menu locations. Select which menu appears in each location.', $num_locations ), number_format_i18n( $num_locations ) );
     470                if ( 1 == $num_locations ) {
     471                        $description = '<p>' . __( 'Your theme supports one menu location. Select which menu you would like to use.' );
     472                } else {
     473                        $description = '<p>' . sprintf( _n( 'Your theme contains %s menu location. Select which menu you would like to use.', 'Your theme contains %s menu locations. Select which menu appears in each location.', $num_locations ), number_format_i18n( $num_locations ) );
     474                }
    471475                $description  .= '</p><p>' . __( 'You can also place menus in widget areas with the Custom Menu widget.' ) . '</p>';
    472476
    473477                $this->manager->add_section( 'menu_locations', array(
  • src/wp-includes/default-constants.php

     
    9595        // Constants for features added to WP that should short-circuit their plugin implementations
    9696        define( 'WP_FEATURE_BETTER_PASSWORDS', true );
    9797
    98         // Constants for expressing human-readable intervals
    99         // in their respective number of seconds.
     98        /**
     99         * Constants for expressing human-readable intervals
     100         * in their respective number of seconds.
     101         *
     102         * Please note that these values are approximate and are provided for convenience.
     103         * For example, MONTH_IN_SECONDS wrongly assumes every month has 30 days.
     104         *
     105         * If you need more accuracy please consider using the DateTime class (http://php.net/manual/class.datetime.php).
     106         */
    100107        define( 'MINUTE_IN_SECONDS', 60 );
    101108        define( 'HOUR_IN_SECONDS',   60 * MINUTE_IN_SECONDS );
    102109        define( 'DAY_IN_SECONDS',    24 * HOUR_IN_SECONDS   );
    103110        define( 'WEEK_IN_SECONDS',    7 * DAY_IN_SECONDS    );
     111        define( 'MONTH_IN_DAYS',     30 * DAY_IN_SECONDS    );
    104112        define( 'YEAR_IN_SECONDS',  365 * DAY_IN_SECONDS    );
    105113}
    106114