Changeset 39896 for trunk/src/wp-includes/rest-api.php

Timestamp:

01/13/2017 04:37:03 AM (4 years ago)

Author:

SergeyBiryukov

Message:

REST API: Improve error messages for number relational validation.

Props jblz.
Fixes #39054.

File:

• trunk/src/wp-includes/rest-api.php (modified) (1 diff)

trunk/src/wp-includes/rest-api.php

@@ -1069 +1069 @@
             if ( ! empty( $args['exclusiveMinimum'] ) && $value <= $args['minimum'] ) {
                 /* translators: 1: parameter, 2: minimum number */
-                return new WP_Error( 'rest_invalid_param', sprintf( __( '%1$s must be greater than %2$d (exclusive)' ), $param, $args['minimum'] ) );
+                return new WP_Error( 'rest_invalid_param', sprintf( __( '%1$s must be greater than %2$d' ), $param, $args['minimum'] ) );
             } elseif ( empty( $args['exclusiveMinimum'] ) && $value < $args['minimum'] ) {
                 /* translators: 1: parameter, 2: minimum number */
-                return new WP_Error( 'rest_invalid_param', sprintf( __( '%1$s must be greater than %2$d (inclusive)' ), $param, $args['minimum'] ) );
+                return new WP_Error( 'rest_invalid_param', sprintf( __( '%1$s must be greater than or equal to %2$d' ), $param, $args['minimum'] ) );
             }
         } elseif ( isset( $args['maximum'] ) && ! isset( $args['minimum'] ) ) {
             if ( ! empty( $args['exclusiveMaximum'] ) && $value >= $args['maximum'] ) {
                 /* translators: 1: parameter, 2: maximum number */
-                return new WP_Error( 'rest_invalid_param', sprintf( __( '%1$s must be less than %2$d (exclusive)' ), $param, $args['maximum'] ) );
+                return new WP_Error( 'rest_invalid_param', sprintf( __( '%1$s must be less than %2$d' ), $param, $args['maximum'] ) );
             } elseif ( empty( $args['exclusiveMaximum'] ) && $value > $args['maximum'] ) {
                 /* translators: 1: parameter, 2: maximum number */
-                return new WP_Error( 'rest_invalid_param', sprintf( __( '%1$s must be less than %2$d (inclusive)' ), $param, $args['maximum'] ) );
+                return new WP_Error( 'rest_invalid_param', sprintf( __( '%1$s must be less than or equal to %2$d' ), $param, $args['maximum'] ) );
             }
         } elseif ( isset( $args['maximum'] ) && isset( $args['minimum'] ) ) {