From 69bfd1ff63c2436bb76048a3ec0f8d56482d3bb5 Mon Sep 17 00:00:00 2001 From: Sergey Biryukov Date: Sun, 4 Apr 2021 18:34:04 +0000 Subject: [PATCH] Coding Standards: Move some translator comments to the correct place. Follow-up to [46273], [50060], [50117]. Merges [50654] to the 5.7 branch. See #52627. Built from https://develop.svn.wordpress.org/branches/5.7@50655 git-svn-id: http://core.svn.wordpress.org/branches/5.7@50267 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- .../class-wp-recovery-mode-email-service.php | 2 +- wp-includes/rest-api.php | 20 +++++++++---------- wp-includes/version.php | 2 +- wp-login.php | 2 +- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/wp-includes/class-wp-recovery-mode-email-service.php b/wp-includes/class-wp-recovery-mode-email-service.php index 834099a56e..9c8dd6964a 100644 --- a/wp-includes/class-wp-recovery-mode-email-service.php +++ b/wp-includes/class-wp-recovery-mode-email-service.php @@ -331,8 +331,8 @@ When seeking help with this issue, you may be asked for some of the following in } $debug = array( - /* translators: %s: Current WordPress version number. */ 'wp' => sprintf( + /* translators: %s: Current WordPress version number. */ __( 'WordPress version %s' ), $wp_version ), diff --git a/wp-includes/rest-api.php b/wp-includes/rest-api.php index 336fe6b071..4ca0ae7cb0 100644 --- a/wp-includes/rest-api.php +++ b/wp-includes/rest-api.php @@ -2284,8 +2284,8 @@ function rest_validate_object_value_from_schema( $value, $args, $param ) { if ( isset( $args['minProperties'] ) && count( $value ) < $args['minProperties'] ) { return new WP_Error( 'rest_too_few_properties', - /* translators: 1: Parameter, 2: Number. */ sprintf( + /* translators: 1: Parameter, 2: Number. */ _n( '%1$s must contain at least %2$s property.', '%1$s must contain at least %2$s properties.', @@ -2300,8 +2300,8 @@ function rest_validate_object_value_from_schema( $value, $args, $param ) { if ( isset( $args['maxProperties'] ) && count( $value ) > $args['maxProperties'] ) { return new WP_Error( 'rest_too_many_properties', - /* translators: 1: Parameter, 2: Number. */ sprintf( + /* translators: 1: Parameter, 2: Number. */ _n( '%1$s must contain at most %2$s property.', '%1$s must contain at most %2$s properties.', @@ -2350,8 +2350,8 @@ function rest_validate_array_value_from_schema( $value, $args, $param ) { if ( isset( $args['minItems'] ) && count( $value ) < $args['minItems'] ) { return new WP_Error( 'rest_too_few_items', - /* translators: 1: Parameter, 2: Number. */ sprintf( + /* translators: 1: Parameter, 2: Number. */ _n( '%1$s must contain at least %2$s item.', '%1$s must contain at least %2$s items.', @@ -2366,8 +2366,8 @@ function rest_validate_array_value_from_schema( $value, $args, $param ) { if ( isset( $args['maxItems'] ) && count( $value ) > $args['maxItems'] ) { return new WP_Error( 'rest_too_many_items', - /* translators: 1: Parameter, 2: Number. */ sprintf( + /* translators: 1: Parameter, 2: Number. */ _n( '%1$s must contain at most %2$s item.', '%1$s must contain at most %2$s items.', @@ -2456,8 +2456,8 @@ function rest_validate_number_value_from_schema( $value, $args, $param ) { if ( $value >= $args['maximum'] || $value <= $args['minimum'] ) { return new WP_Error( 'rest_out_of_bounds', - /* translators: 1: Parameter, 2: Minimum number, 3: Maximum number. */ sprintf( + /* translators: 1: Parameter, 2: Minimum number, 3: Maximum number. */ __( '%1$s must be between %2$d (exclusive) and %3$d (exclusive)' ), $param, $args['minimum'], @@ -2471,8 +2471,8 @@ function rest_validate_number_value_from_schema( $value, $args, $param ) { if ( $value > $args['maximum'] || $value <= $args['minimum'] ) { return new WP_Error( 'rest_out_of_bounds', - /* translators: 1: Parameter, 2: Minimum number, 3: Maximum number. */ sprintf( + /* translators: 1: Parameter, 2: Minimum number, 3: Maximum number. */ __( '%1$s must be between %2$d (exclusive) and %3$d (inclusive)' ), $param, $args['minimum'], @@ -2486,8 +2486,8 @@ function rest_validate_number_value_from_schema( $value, $args, $param ) { if ( $value >= $args['maximum'] || $value < $args['minimum'] ) { return new WP_Error( 'rest_out_of_bounds', - /* translators: 1: Parameter, 2: Minimum number, 3: Maximum number. */ sprintf( + /* translators: 1: Parameter, 2: Minimum number, 3: Maximum number. */ __( '%1$s must be between %2$d (inclusive) and %3$d (exclusive)' ), $param, $args['minimum'], @@ -2501,8 +2501,8 @@ function rest_validate_number_value_from_schema( $value, $args, $param ) { if ( $value > $args['maximum'] || $value < $args['minimum'] ) { return new WP_Error( 'rest_out_of_bounds', - /* translators: 1: Parameter, 2: Minimum number, 3: Maximum number. */ sprintf( + /* translators: 1: Parameter, 2: Minimum number, 3: Maximum number. */ __( '%1$s must be between %2$d (inclusive) and %3$d (inclusive)' ), $param, $args['minimum'], @@ -2539,8 +2539,8 @@ function rest_validate_string_value_from_schema( $value, $args, $param ) { if ( isset( $args['minLength'] ) && mb_strlen( $value ) < $args['minLength'] ) { return new WP_Error( 'rest_too_short', - /* translators: 1: Parameter, 2: Number of characters. */ sprintf( + /* translators: 1: Parameter, 2: Number of characters. */ _n( '%1$s must be at least %2$s character long.', '%1$s must be at least %2$s characters long.', @@ -2555,8 +2555,8 @@ function rest_validate_string_value_from_schema( $value, $args, $param ) { if ( isset( $args['maxLength'] ) && mb_strlen( $value ) > $args['maxLength'] ) { return new WP_Error( 'rest_too_long', - /* translators: 1: Parameter, 2: Number of characters. */ sprintf( + /* translators: 1: Parameter, 2: Number of characters. */ _n( '%1$s must be at most %2$s character long.', '%1$s must be at most %2$s characters long.', diff --git a/wp-includes/version.php b/wp-includes/version.php index 3cb6924af9..90c6fe705f 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -13,7 +13,7 @@ * * @global string $wp_version */ -$wp_version = '5.7.1-alpha-50649'; +$wp_version = '5.7.1-alpha-50655'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. diff --git a/wp-login.php b/wp-login.php index 301424f687..6926c1d973 100644 --- a/wp-login.php +++ b/wp-login.php @@ -287,8 +287,8 @@ function login_footer( $input_id = '' ) { $html_link = sprintf( '%s', esc_url( home_url( '/' ) ), - /* translators: %s: Site title. */ sprintf( + /* translators: %s: Site title. */ _x( '← Go to %s', 'site' ), get_bloginfo( 'title', 'display' ) )