diff --git src/wp-includes/rest-api.php src/wp-includes/rest-api.php index 34e1c591f6..0b503776fa 100644 --- src/wp-includes/rest-api.php +++ src/wp-includes/rest-api.php @@ -34,10 +34,10 @@ function register_rest_route( $namespace, $route, $args = array(), $override = f * and namespace indexes. If you really need to register a * non-namespaced route, call `WP_REST_Server::register_route` directly. */ - _doing_it_wrong( 'register_rest_route', __( 'Routes must be namespaced with plugin or theme name and version.' ), '4.4.0' ); + _doing_it_wrong( 'register_rest_route', _l( 'Routes must be namespaced with plugin or theme name and version.' ), '4.4.0' ); return false; } else if ( empty( $route ) ) { - _doing_it_wrong( 'register_rest_route', __( 'Route must be specified.' ), '4.4.0' ); + _doing_it_wrong( 'register_rest_route', _l( 'Route must be specified.' ), '4.4.0' ); return false; } @@ -491,10 +491,10 @@ function rest_handle_deprecated_function( $function, $replacement, $version ) { } if ( ! empty( $replacement ) ) { /* translators: 1: function name, 2: WordPress version number, 3: new function name */ - $string = sprintf( __( '%1$s (since %2$s; use %3$s instead)' ), $function, $version, $replacement ); + $string = sprintf( _l( '%1$s (since %2$s; use %3$s instead)' ), $function, $version, $replacement ); } else { /* translators: 1: function name, 2: WordPress version number */ - $string = sprintf( __( '%1$s (since %2$s; no alternative available)' ), $function, $version ); + $string = sprintf( _l( '%1$s (since %2$s; no alternative available)' ), $function, $version ); } header( sprintf( 'X-WP-DeprecatedFunction: %s', $string ) ); @@ -515,10 +515,10 @@ function rest_handle_deprecated_argument( $function, $message, $version ) { } if ( ! empty( $message ) ) { /* translators: 1: function name, 2: WordPress version number, 3: error message */ - $string = sprintf( __( '%1$s (since %2$s; %3$s)' ), $function, $version, $message ); + $string = sprintf( _l( '%1$s (since %2$s; %3$s)' ), $function, $version, $message ); } else { /* translators: 1: function name, 2: WordPress version number */ - $string = sprintf( __( '%1$s (since %2$s; no alternative available)' ), $function, $version ); + $string = sprintf( _l( '%1$s (since %2$s; no alternative available)' ), $function, $version ); } header( sprintf( 'X-WP-DeprecatedParam: %s', $string ) ); @@ -737,7 +737,7 @@ function rest_cookie_check_errors( $result ) { $result = wp_verify_nonce( $nonce, 'wp_rest' ); if ( ! $result ) { - return new WP_Error( 'rest_cookie_invalid_nonce', __( 'Cookie nonce is invalid' ), array( 'status' => 403 ) ); + return new WP_Error( 'rest_cookie_invalid_nonce', _l( 'Cookie nonce is invalid' ), array( 'status' => 403 ) ); } // Send a refreshed nonce in header. @@ -1042,7 +1042,7 @@ function rest_validate_value_from_schema( $value, $args, $param = '' ) { } if ( ! wp_is_numeric_array( $value ) ) { /* translators: 1: parameter, 2: type name */ - return new WP_Error( 'rest_invalid_param', sprintf( __( '%1$s is not of type %2$s.' ), $param, 'array' ) ); + return new WP_Error( 'rest_invalid_param', sprintf( _l( '%1$s is not of type %2$s.' ), $param, 'array' ) ); } foreach ( $value as $index => $v ) { $is_valid = rest_validate_value_from_schema( $v, $args['items'], $param . '[' . $index . ']' ); @@ -1076,47 +1076,47 @@ function rest_validate_value_from_schema( $value, $args, $param = '' ) { if ( ! empty( $args['enum'] ) ) { if ( ! in_array( $value, $args['enum'], true ) ) { /* translators: 1: parameter, 2: list of valid values */ - return new WP_Error( 'rest_invalid_param', sprintf( __( '%1$s is not one of %2$s.' ), $param, implode( ', ', $args['enum'] ) ) ); + return new WP_Error( 'rest_invalid_param', sprintf( _l( '%1$s is not one of %2$s.' ), $param, implode( ', ', $args['enum'] ) ) ); } } if ( in_array( $args['type'], array( 'integer', 'number' ) ) && ! is_numeric( $value ) ) { /* translators: 1: parameter, 2: type name */ - return new WP_Error( 'rest_invalid_param', sprintf( __( '%1$s is not of type %2$s.' ), $param, $args['type'] ) ); + return new WP_Error( 'rest_invalid_param', sprintf( _l( '%1$s is not of type %2$s.' ), $param, $args['type'] ) ); } if ( 'integer' === $args['type'] && round( floatval( $value ) ) !== floatval( $value ) ) { /* translators: 1: parameter, 2: type name */ - return new WP_Error( 'rest_invalid_param', sprintf( __( '%1$s is not of type %2$s.' ), $param, 'integer' ) ); + return new WP_Error( 'rest_invalid_param', sprintf( _l( '%1$s is not of type %2$s.' ), $param, 'integer' ) ); } if ( 'boolean' === $args['type'] && ! rest_is_boolean( $value ) ) { /* translators: 1: parameter, 2: type name */ - return new WP_Error( 'rest_invalid_param', sprintf( __( '%1$s is not of type %2$s.' ), $value, 'boolean' ) ); + return new WP_Error( 'rest_invalid_param', sprintf( _l( '%1$s is not of type %2$s.' ), $value, 'boolean' ) ); } if ( 'string' === $args['type'] && ! is_string( $value ) ) { /* translators: 1: parameter, 2: type name */ - return new WP_Error( 'rest_invalid_param', sprintf( __( '%1$s is not of type %2$s.' ), $param, 'string' ) ); + return new WP_Error( 'rest_invalid_param', sprintf( _l( '%1$s is not of type %2$s.' ), $param, 'string' ) ); } if ( isset( $args['format'] ) ) { switch ( $args['format'] ) { case 'date-time' : if ( ! rest_parse_date( $value ) ) { - return new WP_Error( 'rest_invalid_date', __( 'Invalid date.' ) ); + return new WP_Error( 'rest_invalid_date', _l( 'Invalid date.' ) ); } break; case 'email' : if ( ! is_email( $value ) ) { - return new WP_Error( 'rest_invalid_email', __( 'Invalid email address.' ) ); + return new WP_Error( 'rest_invalid_email', _l( 'Invalid email address.' ) ); } break; case 'ip' : if ( ! rest_is_ip_address( $value ) ) { /* translators: %s: IP address */ - return new WP_Error( 'rest_invalid_param', sprintf( __( '%s is not a valid IP address.' ), $value ) ); + return new WP_Error( 'rest_invalid_param', sprintf( _l( '%s is not a valid IP address.' ), $value ) ); } break; } @@ -1126,39 +1126,39 @@ function rest_validate_value_from_schema( $value, $args, $param = '' ) { if ( isset( $args['minimum'] ) && ! isset( $args['maximum'] ) ) { 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' ), $param, $args['minimum'] ) ); + return new WP_Error( 'rest_invalid_param', sprintf( _l( '%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 or equal to %2$d' ), $param, $args['minimum'] ) ); + return new WP_Error( 'rest_invalid_param', sprintf( _l( '%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' ), $param, $args['maximum'] ) ); + return new WP_Error( 'rest_invalid_param', sprintf( _l( '%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 or equal to %2$d' ), $param, $args['maximum'] ) ); + return new WP_Error( 'rest_invalid_param', sprintf( _l( '%1$s must be less than or equal to %2$d' ), $param, $args['maximum'] ) ); } } elseif ( isset( $args['maximum'] ) && isset( $args['minimum'] ) ) { if ( ! empty( $args['exclusiveMinimum'] ) && ! empty( $args['exclusiveMaximum'] ) ) { if ( $value >= $args['maximum'] || $value <= $args['minimum'] ) { /* translators: 1: parameter, 2: minimum number, 3: maximum number */ - return new WP_Error( 'rest_invalid_param', sprintf( __( '%1$s must be between %2$d (exclusive) and %3$d (exclusive)' ), $param, $args['minimum'], $args['maximum'] ) ); + return new WP_Error( 'rest_invalid_param', sprintf( _l( '%1$s must be between %2$d (exclusive) and %3$d (exclusive)' ), $param, $args['minimum'], $args['maximum'] ) ); } } elseif ( empty( $args['exclusiveMinimum'] ) && ! empty( $args['exclusiveMaximum'] ) ) { if ( $value >= $args['maximum'] || $value < $args['minimum'] ) { /* translators: 1: parameter, 2: minimum number, 3: maximum number */ - return new WP_Error( 'rest_invalid_param', sprintf( __( '%1$s must be between %2$d (inclusive) and %3$d (exclusive)' ), $param, $args['minimum'], $args['maximum'] ) ); + return new WP_Error( 'rest_invalid_param', sprintf( _l( '%1$s must be between %2$d (inclusive) and %3$d (exclusive)' ), $param, $args['minimum'], $args['maximum'] ) ); } } elseif ( ! empty( $args['exclusiveMinimum'] ) && empty( $args['exclusiveMaximum'] ) ) { if ( $value > $args['maximum'] || $value <= $args['minimum'] ) { /* translators: 1: parameter, 2: minimum number, 3: maximum number */ - return new WP_Error( 'rest_invalid_param', sprintf( __( '%1$s must be between %2$d (exclusive) and %3$d (inclusive)' ), $param, $args['minimum'], $args['maximum'] ) ); + return new WP_Error( 'rest_invalid_param', sprintf( _l( '%1$s must be between %2$d (exclusive) and %3$d (inclusive)' ), $param, $args['minimum'], $args['maximum'] ) ); } } elseif ( empty( $args['exclusiveMinimum'] ) && empty( $args['exclusiveMaximum'] ) ) { if ( $value > $args['maximum'] || $value < $args['minimum'] ) { /* translators: 1: parameter, 2: minimum number, 3: maximum number */ - return new WP_Error( 'rest_invalid_param', sprintf( __( '%1$s must be between %2$d (inclusive) and %3$d (inclusive)' ), $param, $args['minimum'], $args['maximum'] ) ); + return new WP_Error( 'rest_invalid_param', sprintf( _l( '%1$s must be between %2$d (inclusive) and %3$d (inclusive)' ), $param, $args['minimum'], $args['maximum'] ) ); } } } diff --git src/wp-includes/rest-api/class-wp-rest-request.php src/wp-includes/rest-api/class-wp-rest-request.php index f9c6317896..3f395ca2c2 100644 --- src/wp-includes/rest-api/class-wp-rest-request.php +++ src/wp-includes/rest-api/class-wp-rest-request.php @@ -654,7 +654,7 @@ class WP_REST_Request implements ArrayAccess { $error_data['json_error_message'] = json_last_error_msg(); } - return new WP_Error( 'rest_invalid_json', __( 'Invalid JSON body passed.' ), $error_data ); + return new WP_Error( 'rest_invalid_json', _l( 'Invalid JSON body passed.' ), $error_data ); } $this->params['JSON'] = $params; @@ -802,7 +802,7 @@ class WP_REST_Request implements ArrayAccess { } if ( $invalid_params ) { - return new WP_Error( 'rest_invalid_param', sprintf( __( 'Invalid parameter(s): %s' ), implode( ', ', array_keys( $invalid_params ) ) ), array( 'status' => 400, 'params' => $invalid_params ) ); + return new WP_Error( 'rest_invalid_param', sprintf( _l( 'Invalid parameter(s): %s' ), implode( ', ', array_keys( $invalid_params ) ) ), array( 'status' => 400, 'params' => $invalid_params ) ); } return true; @@ -840,7 +840,7 @@ class WP_REST_Request implements ArrayAccess { } if ( ! empty( $required ) ) { - return new WP_Error( 'rest_missing_callback_param', sprintf( __( 'Missing parameter(s): %s' ), implode( ', ', $required ) ), array( 'status' => 400, 'params' => $required ) ); + return new WP_Error( 'rest_missing_callback_param', sprintf( _l( 'Missing parameter(s): %s' ), implode( ', ', $required ) ), array( 'status' => 400, 'params' => $required ) ); } /* @@ -858,7 +858,7 @@ class WP_REST_Request implements ArrayAccess { $valid_check = call_user_func( $arg['validate_callback'], $param, $this, $key ); if ( false === $valid_check ) { - $invalid_params[ $key ] = __( 'Invalid parameter.' ); + $invalid_params[ $key ] = _l( 'Invalid parameter.' ); } if ( is_wp_error( $valid_check ) ) { @@ -868,7 +868,7 @@ class WP_REST_Request implements ArrayAccess { } if ( $invalid_params ) { - return new WP_Error( 'rest_invalid_param', sprintf( __( 'Invalid parameter(s): %s' ), implode( ', ', array_keys( $invalid_params ) ) ), array( 'status' => 400, 'params' => $invalid_params ) ); + return new WP_Error( 'rest_invalid_param', sprintf( _l( 'Invalid parameter(s): %s' ), implode( ', ', array_keys( $invalid_params ) ) ), array( 'status' => 400, 'params' => $invalid_params ) ); } return true; diff --git src/wp-includes/rest-api/class-wp-rest-server.php src/wp-includes/rest-api/class-wp-rest-server.php index c69cb4834c..936d0592dc 100644 --- src/wp-includes/rest-api/class-wp-rest-server.php +++ src/wp-includes/rest-api/class-wp-rest-server.php @@ -261,7 +261,7 @@ class WP_REST_Server { * @param bool $rest_enabled Whether the REST API is enabled. Default true. */ apply_filters_deprecated( 'rest_enabled', array( true ), '4.7.0', 'rest_authentication_errors', - __( 'The REST API can no longer be completely disabled, the rest_authentication_errors filter can be used to restrict access to the API, instead.' ) + _l( 'The REST API can no longer be completely disabled, the rest_authentication_errors filter can be used to restrict access to the API, instead.' ) ); /** @@ -277,13 +277,13 @@ class WP_REST_Server { if ( isset( $_GET['_jsonp'] ) ) { if ( ! $jsonp_enabled ) { - echo $this->json_error( 'rest_callback_disabled', __( 'JSONP support is disabled on this site.' ), 400 ); + echo $this->json_error( 'rest_callback_disabled', _l( 'JSONP support is disabled on this site.' ), 400 ); return false; } $jsonp_callback = $_GET['_jsonp']; if ( ! wp_check_jsonp_callback( $jsonp_callback ) ) { - echo $this->json_error( 'rest_callback_invalid', __( 'Invalid JSONP callback function.' ), 400 ); + echo $this->json_error( 'rest_callback_invalid', _l( 'Invalid JSONP callback function.' ), 400 ); return false; } } @@ -851,7 +851,7 @@ class WP_REST_Server { } if ( ! is_callable( $callback ) ) { - $response = new WP_Error( 'rest_invalid_handler', __( 'The handler for the route is invalid' ), array( 'status' => 500 ) ); + $response = new WP_Error( 'rest_invalid_handler', _l( 'The handler for the route is invalid' ), array( 'status' => 500 ) ); } if ( ! is_wp_error( $response ) ) { @@ -908,7 +908,7 @@ class WP_REST_Server { if ( is_wp_error( $permission ) ) { $response = $permission; } elseif ( false === $permission || null === $permission ) { - $response = new WP_Error( 'rest_forbidden', __( 'Sorry, you are not allowed to do that.' ), array( 'status' => 403 ) ); + $response = new WP_Error( 'rest_forbidden', _l( 'Sorry, you are not allowed to do that.' ), array( 'status' => 403 ) ); } } } @@ -972,7 +972,7 @@ class WP_REST_Server { } } - return $this->error_to_response( new WP_Error( 'rest_no_route', __( 'No route was found matching the URL and request method' ), array( 'status' => 404 ) ) ); + return $this->error_to_response( new WP_Error( 'rest_no_route', _l( 'No route was found matching the URL and request method' ), array( 'status' => 404 ) ) ); } /** @@ -1059,7 +1059,7 @@ class WP_REST_Server { $namespace = $request['namespace']; if ( ! isset( $this->namespaces[ $namespace ] ) ) { - return new WP_Error( 'rest_invalid_namespace', __( 'The specified namespace could not be found.' ), array( 'status' => 404 ) ); + return new WP_Error( 'rest_invalid_namespace', _l( 'The specified namespace could not be found.' ), array( 'status' => 404 ) ); } $routes = $this->namespaces[ $namespace ]; diff --git src/wp-includes/rest-api/endpoints/class-wp-rest-attachments-controller.php src/wp-includes/rest-api/endpoints/class-wp-rest-attachments-controller.php index ed101815a1..8f29b1bce0 100644 --- src/wp-includes/rest-api/endpoints/class-wp-rest-attachments-controller.php +++ src/wp-includes/rest-api/endpoints/class-wp-rest-attachments-controller.php @@ -70,7 +70,7 @@ class WP_REST_Attachments_Controller extends WP_REST_Posts_Controller { } if ( ! current_user_can( 'upload_files' ) ) { - return new WP_Error( 'rest_cannot_create', __( 'Sorry, you are not allowed to upload media on this site.' ), array( 'status' => 400 ) ); + return new WP_Error( 'rest_cannot_create', _l( 'Sorry, you are not allowed to upload media on this site.' ), array( 'status' => 400 ) ); } // Attaching media to a post requires ability to edit said post. @@ -79,7 +79,7 @@ class WP_REST_Attachments_Controller extends WP_REST_Posts_Controller { $post_parent_type = get_post_type_object( $parent->post_type ); if ( ! current_user_can( $post_parent_type->cap->edit_post, $request['post'] ) ) { - return new WP_Error( 'rest_cannot_edit', __( 'Sorry, you are not allowed to upload media to this post.' ), array( 'status' => rest_authorization_required_code() ) ); + return new WP_Error( 'rest_cannot_edit', _l( 'Sorry, you are not allowed to upload media to this post.' ), array( 'status' => rest_authorization_required_code() ) ); } } @@ -97,7 +97,7 @@ class WP_REST_Attachments_Controller extends WP_REST_Posts_Controller { public function create_item( $request ) { if ( ! empty( $request['post'] ) && in_array( get_post_type( $request['post'] ), array( 'revision', 'attachment' ), true ) ) { - return new WP_Error( 'rest_invalid_param', __( 'Invalid parent type.' ), array( 'status' => 400 ) ); + return new WP_Error( 'rest_invalid_param', _l( 'Invalid parent type.' ), array( 'status' => 400 ) ); } // Get the file via $_FILES or raw data. @@ -203,7 +203,7 @@ class WP_REST_Attachments_Controller extends WP_REST_Posts_Controller { */ public function update_item( $request ) { if ( ! empty( $request['post'] ) && in_array( get_post_type( $request['post'] ), array( 'revision', 'attachment' ), true ) ) { - return new WP_Error( 'rest_invalid_param', __( 'Invalid parent type.' ), array( 'status' => 400 ) ); + return new WP_Error( 'rest_invalid_param', _l( 'Invalid parent type.' ), array( 'status' => 400 ) ); } $response = parent::update_item( $request ); @@ -377,7 +377,7 @@ class WP_REST_Attachments_Controller extends WP_REST_Posts_Controller { $schema = parent::get_item_schema(); $schema['properties']['alt_text'] = array( - 'description' => __( 'Alternative text to display when attachment is not displayed.' ), + 'description' => _l( 'Alternative text to display when attachment is not displayed.' ), 'type' => 'string', 'context' => array( 'view', 'edit', 'embed' ), 'arg_options' => array( @@ -386,7 +386,7 @@ class WP_REST_Attachments_Controller extends WP_REST_Posts_Controller { ); $schema['properties']['caption'] = array( - 'description' => __( 'The attachment caption.' ), + 'description' => _l( 'The attachment caption.' ), 'type' => 'object', 'context' => array( 'view', 'edit', 'embed' ), 'arg_options' => array( @@ -395,12 +395,12 @@ class WP_REST_Attachments_Controller extends WP_REST_Posts_Controller { ), 'properties' => array( 'raw' => array( - 'description' => __( 'Caption for the attachment, as it exists in the database.' ), + 'description' => _l( 'Caption for the attachment, as it exists in the database.' ), 'type' => 'string', 'context' => array( 'edit' ), ), 'rendered' => array( - 'description' => __( 'HTML caption for the attachment, transformed for display.' ), + 'description' => _l( 'HTML caption for the attachment, transformed for display.' ), 'type' => 'string', 'context' => array( 'view', 'edit', 'embed' ), 'readonly' => true, @@ -409,7 +409,7 @@ class WP_REST_Attachments_Controller extends WP_REST_Posts_Controller { ); $schema['properties']['description'] = array( - 'description' => __( 'The attachment description.' ), + 'description' => _l( 'The attachment description.' ), 'type' => 'object', 'context' => array( 'view', 'edit' ), 'arg_options' => array( @@ -418,12 +418,12 @@ class WP_REST_Attachments_Controller extends WP_REST_Posts_Controller { ), 'properties' => array( 'raw' => array( - 'description' => __( 'Description for the object, as it exists in the database.' ), + 'description' => _l( 'Description for the object, as it exists in the database.' ), 'type' => 'string', 'context' => array( 'edit' ), ), 'rendered' => array( - 'description' => __( 'HTML description for the object, transformed for display.' ), + 'description' => _l( 'HTML description for the object, transformed for display.' ), 'type' => 'string', 'context' => array( 'view', 'edit' ), 'readonly' => true, @@ -432,7 +432,7 @@ class WP_REST_Attachments_Controller extends WP_REST_Posts_Controller { ); $schema['properties']['media_type'] = array( - 'description' => __( 'Attachment type.' ), + 'description' => _l( 'Attachment type.' ), 'type' => 'string', 'enum' => array( 'image', 'file' ), 'context' => array( 'view', 'edit', 'embed' ), @@ -440,27 +440,27 @@ class WP_REST_Attachments_Controller extends WP_REST_Posts_Controller { ); $schema['properties']['mime_type'] = array( - 'description' => __( 'The attachment MIME type.' ), + 'description' => _l( 'The attachment MIME type.' ), 'type' => 'string', 'context' => array( 'view', 'edit', 'embed' ), 'readonly' => true, ); $schema['properties']['media_details'] = array( - 'description' => __( 'Details about the media file, specific to its type.' ), + 'description' => _l( 'Details about the media file, specific to its type.' ), 'type' => 'object', 'context' => array( 'view', 'edit', 'embed' ), 'readonly' => true, ); $schema['properties']['post'] = array( - 'description' => __( 'The ID for the associated post of the attachment.' ), + 'description' => _l( 'The ID for the associated post of the attachment.' ), 'type' => 'integer', 'context' => array( 'view', 'edit' ), ); $schema['properties']['source_url'] = array( - 'description' => __( 'URL to the original attachment file.' ), + 'description' => _l( 'URL to the original attachment file.' ), 'type' => 'string', 'format' => 'uri', 'context' => array( 'view', 'edit', 'embed' ), @@ -483,21 +483,21 @@ class WP_REST_Attachments_Controller extends WP_REST_Posts_Controller { */ protected function upload_from_data( $data, $headers ) { if ( empty( $data ) ) { - return new WP_Error( 'rest_upload_no_data', __( 'No data supplied.' ), array( 'status' => 400 ) ); + return new WP_Error( 'rest_upload_no_data', _l( 'No data supplied.' ), array( 'status' => 400 ) ); } if ( empty( $headers['content_type'] ) ) { - return new WP_Error( 'rest_upload_no_content_type', __( 'No Content-Type supplied.' ), array( 'status' => 400 ) ); + return new WP_Error( 'rest_upload_no_content_type', _l( 'No Content-Type supplied.' ), array( 'status' => 400 ) ); } if ( empty( $headers['content_disposition'] ) ) { - return new WP_Error( 'rest_upload_no_content_disposition', __( 'No Content-Disposition supplied.' ), array( 'status' => 400 ) ); + return new WP_Error( 'rest_upload_no_content_disposition', _l( 'No Content-Disposition supplied.' ), array( 'status' => 400 ) ); } $filename = self::get_filename_from_disposition( $headers['content_disposition'] ); if ( empty( $filename ) ) { - return new WP_Error( 'rest_upload_invalid_disposition', __( 'Invalid Content-Disposition supplied. Content-Disposition needs to be formatted as `attachment; filename="image.png"` or similar.' ), array( 'status' => 400 ) ); + return new WP_Error( 'rest_upload_invalid_disposition', _l( 'Invalid Content-Disposition supplied. Content-Disposition needs to be formatted as `attachment; filename="image.png"` or similar.' ), array( 'status' => 400 ) ); } if ( ! empty( $headers['content_md5'] ) ) { @@ -506,7 +506,7 @@ class WP_REST_Attachments_Controller extends WP_REST_Posts_Controller { $actual = md5( $data ); if ( $expected !== $actual ) { - return new WP_Error( 'rest_upload_hash_mismatch', __( 'Content hash did not match expected.' ), array( 'status' => 412 ) ); + return new WP_Error( 'rest_upload_hash_mismatch', _l( 'Content hash did not match expected.' ), array( 'status' => 412 ) ); } } @@ -522,7 +522,7 @@ class WP_REST_Attachments_Controller extends WP_REST_Posts_Controller { $fp = fopen( $tmpfname, 'w+' ); if ( ! $fp ) { - return new WP_Error( 'rest_upload_file_error', __( 'Could not open file handle.' ), array( 'status' => 500 ) ); + return new WP_Error( 'rest_upload_file_error', _l( 'Could not open file handle.' ), array( 'status' => 500 ) ); } fwrite( $fp, $data ); @@ -636,14 +636,14 @@ class WP_REST_Attachments_Controller extends WP_REST_Posts_Controller { $params['media_type'] = array( 'default' => null, - 'description' => __( 'Limit result set to attachments of a particular media type.' ), + 'description' => _l( 'Limit result set to attachments of a particular media type.' ), 'type' => 'string', 'enum' => array_keys( $media_types ), ); $params['mime_type'] = array( 'default' => null, - 'description' => __( 'Limit result set to attachments of a particular MIME type.' ), + 'description' => _l( 'Limit result set to attachments of a particular MIME type.' ), 'type' => 'string', ); @@ -679,7 +679,7 @@ class WP_REST_Attachments_Controller extends WP_REST_Posts_Controller { */ protected function upload_from_file( $files, $headers ) { if ( empty( $files ) ) { - return new WP_Error( 'rest_upload_no_data', __( 'No data supplied.' ), array( 'status' => 400 ) ); + return new WP_Error( 'rest_upload_no_data', _l( 'No data supplied.' ), array( 'status' => 400 ) ); } // Verify hash, if given. @@ -689,7 +689,7 @@ class WP_REST_Attachments_Controller extends WP_REST_Posts_Controller { $actual = md5_file( $files['file']['tmp_name'] ); if ( $expected !== $actual ) { - return new WP_Error( 'rest_upload_hash_mismatch', __( 'Content hash did not match expected.' ), array( 'status' => 412 ) ); + return new WP_Error( 'rest_upload_hash_mismatch', _l( 'Content hash did not match expected.' ), array( 'status' => 412 ) ); } } diff --git src/wp-includes/rest-api/endpoints/class-wp-rest-comments-controller.php src/wp-includes/rest-api/endpoints/class-wp-rest-comments-controller.php index 415ba8e9bc..ff62935da5 100644 --- src/wp-includes/rest-api/endpoints/class-wp-rest-comments-controller.php +++ src/wp-includes/rest-api/endpoints/class-wp-rest-comments-controller.php @@ -62,7 +62,7 @@ class WP_REST_Comments_Controller extends WP_REST_Controller { register_rest_route( $this->namespace, '/' . $this->rest_base . '/(?P[\d]+)', array( 'args' => array( 'id' => array( - 'description' => __( 'Unique identifier for the object.' ), + 'description' => _l( 'Unique identifier for the object.' ), 'type' => 'integer', ), ), @@ -73,7 +73,7 @@ class WP_REST_Comments_Controller extends WP_REST_Controller { 'args' => array( 'context' => $this->get_context_param( array( 'default' => 'view' ) ), 'password' => array( - 'description' => __( 'The password for the parent post of the comment (if the post is password protected).' ), + 'description' => _l( 'The password for the parent post of the comment (if the post is password protected).' ), 'type' => 'string', ), ), @@ -92,10 +92,10 @@ class WP_REST_Comments_Controller extends WP_REST_Controller { 'force' => array( 'type' => 'boolean', 'default' => false, - 'description' => __( 'Whether to bypass trash and force deletion.' ), + 'description' => _l( 'Whether to bypass trash and force deletion.' ), ), 'password' => array( - 'description' => __( 'The password for the parent post of the comment (if the post is password protected).' ), + 'description' => _l( 'The password for the parent post of the comment (if the post is password protected).' ), 'type' => 'string', ), ), @@ -119,15 +119,15 @@ class WP_REST_Comments_Controller extends WP_REST_Controller { $post = get_post( $post_id ); if ( ! empty( $post_id ) && $post && ! $this->check_read_post_permission( $post, $request ) ) { - return new WP_Error( 'rest_cannot_read_post', __( 'Sorry, you are not allowed to read the post for this comment.' ), array( 'status' => rest_authorization_required_code() ) ); + return new WP_Error( 'rest_cannot_read_post', _l( 'Sorry, you are not allowed to read the post for this comment.' ), array( 'status' => rest_authorization_required_code() ) ); } elseif ( 0 === $post_id && ! current_user_can( 'moderate_comments' ) ) { - return new WP_Error( 'rest_cannot_read', __( 'Sorry, you are not allowed to read comments without a post.' ), array( 'status' => rest_authorization_required_code() ) ); + return new WP_Error( 'rest_cannot_read', _l( 'Sorry, you are not allowed to read comments without a post.' ), array( 'status' => rest_authorization_required_code() ) ); } } } if ( ! empty( $request['context'] ) && 'edit' === $request['context'] && ! current_user_can( 'moderate_comments' ) ) { - return new WP_Error( 'rest_forbidden_context', __( 'Sorry, you are not allowed to edit comments.' ), array( 'status' => rest_authorization_required_code() ) ); + return new WP_Error( 'rest_forbidden_context', _l( 'Sorry, you are not allowed to edit comments.' ), array( 'status' => rest_authorization_required_code() ) ); } if ( ! current_user_can( 'edit_posts' ) ) { @@ -149,7 +149,7 @@ class WP_REST_Comments_Controller extends WP_REST_Controller { } if ( ! empty( $forbidden_params ) ) { - return new WP_Error( 'rest_forbidden_param', sprintf( __( 'Query parameter not permitted: %s' ), implode( ', ', $forbidden_params ) ), array( 'status' => rest_authorization_required_code() ) ); + return new WP_Error( 'rest_forbidden_param', sprintf( _l( 'Query parameter not permitted: %s' ), implode( ', ', $forbidden_params ) ), array( 'status' => rest_authorization_required_code() ) ); } } @@ -309,7 +309,7 @@ class WP_REST_Comments_Controller extends WP_REST_Controller { * @return WP_Comment|WP_Error Comment object if ID is valid, WP_Error otherwise. */ protected function get_comment( $id ) { - $error = new WP_Error( 'rest_comment_invalid_id', __( 'Invalid comment ID.' ), array( 'status' => 404 ) ); + $error = new WP_Error( 'rest_comment_invalid_id', _l( 'Invalid comment ID.' ), array( 'status' => 404 ) ); if ( (int) $id <= 0 ) { return $error; } @@ -323,7 +323,7 @@ class WP_REST_Comments_Controller extends WP_REST_Controller { if ( ! empty( $comment->comment_post_ID ) ) { $post = get_post( (int) $comment->comment_post_ID ); if ( empty( $post ) ) { - return new WP_Error( 'rest_post_invalid_id', __( 'Invalid post ID.' ), array( 'status' => 404 ) ); + return new WP_Error( 'rest_post_invalid_id', _l( 'Invalid post ID.' ), array( 'status' => 404 ) ); } } @@ -345,17 +345,17 @@ class WP_REST_Comments_Controller extends WP_REST_Controller { } if ( ! empty( $request['context'] ) && 'edit' === $request['context'] && ! current_user_can( 'moderate_comments' ) ) { - return new WP_Error( 'rest_forbidden_context', __( 'Sorry, you are not allowed to edit comments.' ), array( 'status' => rest_authorization_required_code() ) ); + return new WP_Error( 'rest_forbidden_context', _l( 'Sorry, you are not allowed to edit comments.' ), array( 'status' => rest_authorization_required_code() ) ); } $post = get_post( $comment->comment_post_ID ); if ( ! $this->check_read_permission( $comment, $request ) ) { - return new WP_Error( 'rest_cannot_read', __( 'Sorry, you are not allowed to read this comment.' ), array( 'status' => rest_authorization_required_code() ) ); + return new WP_Error( 'rest_cannot_read', _l( 'Sorry, you are not allowed to read this comment.' ), array( 'status' => rest_authorization_required_code() ) ); } if ( $post && ! $this->check_read_post_permission( $post, $request ) ) { - return new WP_Error( 'rest_cannot_read_post', __( 'Sorry, you are not allowed to read the post for this comment.' ), array( 'status' => rest_authorization_required_code() ) ); + return new WP_Error( 'rest_cannot_read_post', _l( 'Sorry, you are not allowed to read the post for this comment.' ), array( 'status' => rest_authorization_required_code() ) ); } return true; @@ -392,7 +392,7 @@ class WP_REST_Comments_Controller extends WP_REST_Controller { public function create_item_permissions_check( $request ) { if ( ! is_user_logged_in() ) { if ( get_option( 'comment_registration' ) ) { - return new WP_Error( 'rest_comment_login_required', __( 'Sorry, you must be logged in to comment.' ), array( 'status' => 401 ) ); + return new WP_Error( 'rest_comment_login_required', _l( 'Sorry, you must be logged in to comment.' ), array( 'status' => 401 ) ); } /** @@ -409,7 +409,7 @@ class WP_REST_Comments_Controller extends WP_REST_Controller { */ $allow_anonymous = apply_filters( 'rest_allow_anonymous_comments', false, $request ); if ( ! $allow_anonymous ) { - return new WP_Error( 'rest_comment_login_required', __( 'Sorry, you must be logged in to comment.' ), array( 'status' => 401 ) ); + return new WP_Error( 'rest_comment_login_required', _l( 'Sorry, you must be logged in to comment.' ), array( 'status' => 401 ) ); } } @@ -417,7 +417,7 @@ class WP_REST_Comments_Controller extends WP_REST_Controller { if ( isset( $request['author'] ) && get_current_user_id() !== $request['author'] && ! current_user_can( 'moderate_comments' ) ) { return new WP_Error( 'rest_comment_invalid_author', /* translators: %s: request parameter */ - sprintf( __( "Sorry, you are not allowed to edit '%s' for comments." ), 'author' ), + sprintf( _l( "Sorry, you are not allowed to edit '%s' for comments." ), 'author' ), array( 'status' => rest_authorization_required_code() ) ); } @@ -426,7 +426,7 @@ class WP_REST_Comments_Controller extends WP_REST_Controller { if ( empty( $_SERVER['REMOTE_ADDR'] ) || $request['author_ip'] !== $_SERVER['REMOTE_ADDR'] ) { return new WP_Error( 'rest_comment_invalid_author_ip', /* translators: %s: request parameter */ - sprintf( __( "Sorry, you are not allowed to edit '%s' for comments." ), 'author_ip' ), + sprintf( _l( "Sorry, you are not allowed to edit '%s' for comments." ), 'author_ip' ), array( 'status' => rest_authorization_required_code() ) ); } @@ -435,34 +435,34 @@ class WP_REST_Comments_Controller extends WP_REST_Controller { if ( isset( $request['status'] ) && ! current_user_can( 'moderate_comments' ) ) { return new WP_Error( 'rest_comment_invalid_status', /* translators: %s: request parameter */ - sprintf( __( "Sorry, you are not allowed to edit '%s' for comments." ), 'status' ), + sprintf( _l( "Sorry, you are not allowed to edit '%s' for comments." ), 'status' ), array( 'status' => rest_authorization_required_code() ) ); } if ( empty( $request['post'] ) ) { - return new WP_Error( 'rest_comment_invalid_post_id', __( 'Sorry, you are not allowed to create this comment without a post.' ), array( 'status' => 403 ) ); + return new WP_Error( 'rest_comment_invalid_post_id', _l( 'Sorry, you are not allowed to create this comment without a post.' ), array( 'status' => 403 ) ); } $post = get_post( (int) $request['post'] ); if ( ! $post ) { - return new WP_Error( 'rest_comment_invalid_post_id', __( 'Sorry, you are not allowed to create this comment without a post.' ), array( 'status' => 403 ) ); + return new WP_Error( 'rest_comment_invalid_post_id', _l( 'Sorry, you are not allowed to create this comment without a post.' ), array( 'status' => 403 ) ); } if ( 'draft' === $post->post_status ) { - return new WP_Error( 'rest_comment_draft_post', __( 'Sorry, you are not allowed to create a comment on this post.' ), array( 'status' => 403 ) ); + return new WP_Error( 'rest_comment_draft_post', _l( 'Sorry, you are not allowed to create a comment on this post.' ), array( 'status' => 403 ) ); } if ( 'trash' === $post->post_status ) { - return new WP_Error( 'rest_comment_trash_post', __( 'Sorry, you are not allowed to create a comment on this post.' ), array( 'status' => 403 ) ); + return new WP_Error( 'rest_comment_trash_post', _l( 'Sorry, you are not allowed to create a comment on this post.' ), array( 'status' => 403 ) ); } if ( ! $this->check_read_post_permission( $post, $request ) ) { - return new WP_Error( 'rest_cannot_read_post', __( 'Sorry, you are not allowed to read the post for this comment.' ), array( 'status' => rest_authorization_required_code() ) ); + return new WP_Error( 'rest_cannot_read_post', _l( 'Sorry, you are not allowed to read the post for this comment.' ), array( 'status' => rest_authorization_required_code() ) ); } if ( ! comments_open( $post->ID ) ) { - return new WP_Error( 'rest_comment_closed', __( 'Sorry, comments are closed for this item.' ), array( 'status' => 403 ) ); + return new WP_Error( 'rest_comment_closed', _l( 'Sorry, comments are closed for this item.' ), array( 'status' => 403 ) ); } return true; @@ -478,12 +478,12 @@ class WP_REST_Comments_Controller extends WP_REST_Controller { */ public function create_item( $request ) { if ( ! empty( $request['id'] ) ) { - return new WP_Error( 'rest_comment_exists', __( 'Cannot create existing comment.' ), array( 'status' => 400 ) ); + return new WP_Error( 'rest_comment_exists', _l( 'Cannot create existing comment.' ), array( 'status' => 400 ) ); } // Do not allow comments to be created with a non-default type. if ( ! empty( $request['type'] ) && 'comment' !== $request['type'] ) { - return new WP_Error( 'rest_invalid_comment_type', __( 'Cannot create a comment with that type.' ), array( 'status' => 400 ) ); + return new WP_Error( 'rest_invalid_comment_type', _l( 'Cannot create a comment with that type.' ), array( 'status' => 400 ) ); } $prepared_comment = $this->prepare_item_for_database( $request ); @@ -498,7 +498,7 @@ class WP_REST_Comments_Controller extends WP_REST_Controller { * comment_content. See wp_handle_comment_submission(). */ if ( empty( $prepared_comment['comment_content'] ) ) { - return new WP_Error( 'rest_comment_content_invalid', __( 'Invalid comment content.' ), array( 'status' => 400 ) ); + return new WP_Error( 'rest_comment_content_invalid', _l( 'Invalid comment content.' ), array( 'status' => 400 ) ); } // Setting remaining values before wp_insert_comment so we can use wp_allow_comment(). @@ -524,7 +524,7 @@ class WP_REST_Comments_Controller extends WP_REST_Controller { // Honor the discussion setting that requires a name and email address of the comment author. if ( get_option( 'require_name_email' ) ) { if ( empty( $prepared_comment['comment_author'] ) || empty( $prepared_comment['comment_author_email'] ) ) { - return new WP_Error( 'rest_comment_author_data_required', __( 'Creating a comment requires valid author name and email values.' ), array( 'status' => 400 ) ); + return new WP_Error( 'rest_comment_author_data_required', _l( 'Creating a comment requires valid author name and email values.' ), array( 'status' => 400 ) ); } } @@ -543,7 +543,7 @@ class WP_REST_Comments_Controller extends WP_REST_Controller { $check_comment_lengths = wp_check_comment_data_max_lengths( $prepared_comment ); if ( is_wp_error( $check_comment_lengths ) ) { $error_code = $check_comment_lengths->get_error_code(); - return new WP_Error( $error_code, __( 'Comment field exceeds maximum length allowed.' ), array( 'status' => 400 ) ); + return new WP_Error( $error_code, _l( 'Comment field exceeds maximum length allowed.' ), array( 'status' => 400 ) ); } $prepared_comment['comment_approved'] = wp_allow_comment( $prepared_comment, true ); @@ -584,7 +584,7 @@ class WP_REST_Comments_Controller extends WP_REST_Controller { $comment_id = wp_insert_comment( wp_filter_comment( wp_slash( (array) $prepared_comment ) ) ); if ( ! $comment_id ) { - return new WP_Error( 'rest_comment_failed_create', __( 'Creating comment failed.' ), array( 'status' => 500 ) ); + return new WP_Error( 'rest_comment_failed_create', _l( 'Creating comment failed.' ), array( 'status' => 500 ) ); } if ( isset( $request['status'] ) ) { @@ -650,7 +650,7 @@ class WP_REST_Comments_Controller extends WP_REST_Controller { } if ( ! $this->check_edit_permission( $comment ) ) { - return new WP_Error( 'rest_cannot_edit', __( 'Sorry, you are not allowed to edit this comment.' ), array( 'status' => rest_authorization_required_code() ) ); + return new WP_Error( 'rest_cannot_edit', _l( 'Sorry, you are not allowed to edit this comment.' ), array( 'status' => rest_authorization_required_code() ) ); } return true; @@ -673,7 +673,7 @@ class WP_REST_Comments_Controller extends WP_REST_Controller { $id = $comment->comment_ID; if ( isset( $request['type'] ) && get_comment_type( $id ) !== $request['type'] ) { - return new WP_Error( 'rest_comment_invalid_type', __( 'Sorry, you are not allowed to change the comment type.' ), array( 'status' => 404 ) ); + return new WP_Error( 'rest_comment_invalid_type', _l( 'Sorry, you are not allowed to change the comment type.' ), array( 'status' => 404 ) ); } $prepared_args = $this->prepare_item_for_database( $request ); @@ -685,7 +685,7 @@ class WP_REST_Comments_Controller extends WP_REST_Controller { if ( ! empty( $prepared_args['comment_post_ID'] ) ) { $post = get_post( $prepared_args['comment_post_ID'] ); if ( empty( $post ) ) { - return new WP_Error( 'rest_comment_invalid_post_id', __( 'Invalid post ID.' ), array( 'status' => 403 ) ); + return new WP_Error( 'rest_comment_invalid_post_id', _l( 'Invalid post ID.' ), array( 'status' => 403 ) ); } } @@ -694,7 +694,7 @@ class WP_REST_Comments_Controller extends WP_REST_Controller { $change = $this->handle_status_param( $request['status'], $id ); if ( ! $change ) { - return new WP_Error( 'rest_comment_failed_edit', __( 'Updating comment status failed.' ), array( 'status' => 500 ) ); + return new WP_Error( 'rest_comment_failed_edit', _l( 'Updating comment status failed.' ), array( 'status' => 500 ) ); } } elseif ( ! empty( $prepared_args ) ) { if ( is_wp_error( $prepared_args ) ) { @@ -702,7 +702,7 @@ class WP_REST_Comments_Controller extends WP_REST_Controller { } if ( isset( $prepared_args['comment_content'] ) && empty( $prepared_args['comment_content'] ) ) { - return new WP_Error( 'rest_comment_content_invalid', __( 'Invalid comment content.' ), array( 'status' => 400 ) ); + return new WP_Error( 'rest_comment_content_invalid', _l( 'Invalid comment content.' ), array( 'status' => 400 ) ); } $prepared_args['comment_ID'] = $id; @@ -710,13 +710,13 @@ class WP_REST_Comments_Controller extends WP_REST_Controller { $check_comment_lengths = wp_check_comment_data_max_lengths( $prepared_args ); if ( is_wp_error( $check_comment_lengths ) ) { $error_code = $check_comment_lengths->get_error_code(); - return new WP_Error( $error_code, __( 'Comment field exceeds maximum length allowed.' ), array( 'status' => 400 ) ); + return new WP_Error( $error_code, _l( 'Comment field exceeds maximum length allowed.' ), array( 'status' => 400 ) ); } $updated = wp_update_comment( wp_slash( (array) $prepared_args ) ); if ( false === $updated ) { - return new WP_Error( 'rest_comment_failed_edit', __( 'Updating comment failed.' ), array( 'status' => 500 ) ); + return new WP_Error( 'rest_comment_failed_edit', _l( 'Updating comment failed.' ), array( 'status' => 500 ) ); } if ( isset( $request['status'] ) ) { @@ -767,7 +767,7 @@ class WP_REST_Comments_Controller extends WP_REST_Controller { } if ( ! $this->check_edit_permission( $comment ) ) { - return new WP_Error( 'rest_cannot_delete', __( 'Sorry, you are not allowed to delete this comment.' ), array( 'status' => rest_authorization_required_code() ) ); + return new WP_Error( 'rest_cannot_delete', _l( 'Sorry, you are not allowed to delete this comment.' ), array( 'status' => rest_authorization_required_code() ) ); } return true; } @@ -811,11 +811,11 @@ class WP_REST_Comments_Controller extends WP_REST_Controller { // If this type doesn't support trashing, error out. if ( ! $supports_trash ) { /* translators: %s: force=true */ - return new WP_Error( 'rest_trash_not_supported', sprintf( __( "The comment does not support trashing. Set '%s' to delete." ), 'force=true' ), array( 'status' => 501 ) ); + return new WP_Error( 'rest_trash_not_supported', sprintf( _l( "The comment does not support trashing. Set '%s' to delete." ), 'force=true' ), array( 'status' => 501 ) ); } if ( 'trash' === $comment->comment_approved ) { - return new WP_Error( 'rest_already_trashed', __( 'The comment has already been trashed.' ), array( 'status' => 410 ) ); + return new WP_Error( 'rest_already_trashed', _l( 'The comment has already been trashed.' ), array( 'status' => 410 ) ); } $result = wp_trash_comment( $comment->comment_ID ); @@ -824,7 +824,7 @@ class WP_REST_Comments_Controller extends WP_REST_Controller { } if ( ! $result ) { - return new WP_Error( 'rest_cannot_delete', __( 'The comment cannot be deleted.' ), array( 'status' => 500 ) ); + return new WP_Error( 'rest_cannot_delete', _l( 'The comment cannot be deleted.' ), array( 'status' => 500 ) ); } /** @@ -1075,7 +1075,7 @@ class WP_REST_Comments_Controller extends WP_REST_Controller { $prepared_comment['comment_author_email'] = $user->user_email; $prepared_comment['comment_author_url'] = $user->user_url; } else { - return new WP_Error( 'rest_comment_author_invalid', __( 'Invalid comment author ID.' ), array( 'status' => 400 ) ); + return new WP_Error( 'rest_comment_author_invalid', _l( 'Invalid comment author ID.' ), array( 'status' => 400 ) ); } } @@ -1146,18 +1146,18 @@ class WP_REST_Comments_Controller extends WP_REST_Controller { 'type' => 'object', 'properties' => array( 'id' => array( - 'description' => __( 'Unique identifier for the object.' ), + 'description' => _l( 'Unique identifier for the object.' ), 'type' => 'integer', 'context' => array( 'view', 'edit', 'embed' ), 'readonly' => true, ), 'author' => array( - 'description' => __( 'The ID of the user object, if author was a user.' ), + 'description' => _l( 'The ID of the user object, if author was a user.' ), 'type' => 'integer', 'context' => array( 'view', 'edit', 'embed' ), ), 'author_email' => array( - 'description' => __( 'Email address for the object author.' ), + 'description' => _l( 'Email address for the object author.' ), 'type' => 'string', 'format' => 'email', 'context' => array( 'edit' ), @@ -1167,13 +1167,13 @@ class WP_REST_Comments_Controller extends WP_REST_Controller { ), ), 'author_ip' => array( - 'description' => __( 'IP address for the object author.' ), + 'description' => _l( 'IP address for the object author.' ), 'type' => 'string', 'format' => 'ip', 'context' => array( 'edit' ), ), 'author_name' => array( - 'description' => __( 'Display name for the object author.' ), + 'description' => _l( 'Display name for the object author.' ), 'type' => 'string', 'context' => array( 'view', 'edit', 'embed' ), 'arg_options' => array( @@ -1181,13 +1181,13 @@ class WP_REST_Comments_Controller extends WP_REST_Controller { ), ), 'author_url' => array( - 'description' => __( 'URL for the object author.' ), + 'description' => _l( 'URL for the object author.' ), 'type' => 'string', 'format' => 'uri', 'context' => array( 'view', 'edit', 'embed' ), ), 'author_user_agent' => array( - 'description' => __( 'User agent for the object author.' ), + 'description' => _l( 'User agent for the object author.' ), 'type' => 'string', 'context' => array( 'edit' ), 'arg_options' => array( @@ -1195,7 +1195,7 @@ class WP_REST_Comments_Controller extends WP_REST_Controller { ), ), 'content' => array( - 'description' => __( 'The content for the object.' ), + 'description' => _l( 'The content for the object.' ), 'type' => 'object', 'context' => array( 'view', 'edit', 'embed' ), 'arg_options' => array( @@ -1204,12 +1204,12 @@ class WP_REST_Comments_Controller extends WP_REST_Controller { ), 'properties' => array( 'raw' => array( - 'description' => __( 'Content for the object, as it exists in the database.' ), + 'description' => _l( 'Content for the object, as it exists in the database.' ), 'type' => 'string', 'context' => array( 'edit' ), ), 'rendered' => array( - 'description' => __( 'HTML content for the object, transformed for display.' ), + 'description' => _l( 'HTML content for the object, transformed for display.' ), 'type' => 'string', 'context' => array( 'view', 'edit', 'embed' ), 'readonly' => true, @@ -1217,38 +1217,38 @@ class WP_REST_Comments_Controller extends WP_REST_Controller { ), ), 'date' => array( - 'description' => __( "The date the object was published, in the site's timezone." ), + 'description' => _l( "The date the object was published, in the site's timezone." ), 'type' => 'string', 'format' => 'date-time', 'context' => array( 'view', 'edit', 'embed' ), ), 'date_gmt' => array( - 'description' => __( 'The date the object was published, as GMT.' ), + 'description' => _l( 'The date the object was published, as GMT.' ), 'type' => 'string', 'format' => 'date-time', 'context' => array( 'view', 'edit' ), ), 'link' => array( - 'description' => __( 'URL to the object.' ), + 'description' => _l( 'URL to the object.' ), 'type' => 'string', 'format' => 'uri', 'context' => array( 'view', 'edit', 'embed' ), 'readonly' => true, ), 'parent' => array( - 'description' => __( 'The ID for the parent of the object.' ), + 'description' => _l( 'The ID for the parent of the object.' ), 'type' => 'integer', 'context' => array( 'view', 'edit', 'embed' ), 'default' => 0, ), 'post' => array( - 'description' => __( 'The ID of the associated post object.' ), + 'description' => _l( 'The ID of the associated post object.' ), 'type' => 'integer', 'context' => array( 'view', 'edit' ), 'default' => 0, ), 'status' => array( - 'description' => __( 'State of the object.' ), + 'description' => _l( 'State of the object.' ), 'type' => 'string', 'context' => array( 'view', 'edit' ), 'arg_options' => array( @@ -1256,7 +1256,7 @@ class WP_REST_Comments_Controller extends WP_REST_Controller { ), ), 'type' => array( - 'description' => __( 'Type of Comment for the object.' ), + 'description' => _l( 'Type of Comment for the object.' ), 'type' => 'string', 'context' => array( 'view', 'edit', 'embed' ), 'readonly' => true, @@ -1271,7 +1271,7 @@ class WP_REST_Comments_Controller extends WP_REST_Controller { foreach ( $avatar_sizes as $size ) { $avatar_properties[ $size ] = array( /* translators: %d: avatar image size in pixels */ - 'description' => sprintf( __( 'Avatar URL with image size of %d pixels.' ), $size ), + 'description' => sprintf( _l( 'Avatar URL with image size of %d pixels.' ), $size ), 'type' => 'string', 'format' => 'uri', 'context' => array( 'embed', 'view', 'edit' ), @@ -1279,7 +1279,7 @@ class WP_REST_Comments_Controller extends WP_REST_Controller { } $schema['properties']['author_avatar_urls'] = array( - 'description' => __( 'Avatar URLs for the object author.' ), + 'description' => _l( 'Avatar URLs for the object author.' ), 'type' => 'object', 'context' => array( 'view', 'edit', 'embed' ), 'readonly' => true, @@ -1305,13 +1305,13 @@ class WP_REST_Comments_Controller extends WP_REST_Controller { $query_params['context']['default'] = 'view'; $query_params['after'] = array( - 'description' => __( 'Limit response to comments published after a given ISO8601 compliant date.' ), + 'description' => _l( 'Limit response to comments published after a given ISO8601 compliant date.' ), 'type' => 'string', 'format' => 'date-time', ); $query_params['author'] = array( - 'description' => __( 'Limit result set to comments assigned to specific user IDs. Requires authorization.' ), + 'description' => _l( 'Limit result set to comments assigned to specific user IDs. Requires authorization.' ), 'type' => 'array', 'items' => array( 'type' => 'integer', @@ -1319,7 +1319,7 @@ class WP_REST_Comments_Controller extends WP_REST_Controller { ); $query_params['author_exclude'] = array( - 'description' => __( 'Ensure result set excludes comments assigned to specific user IDs. Requires authorization.' ), + 'description' => _l( 'Ensure result set excludes comments assigned to specific user IDs. Requires authorization.' ), 'type' => 'array', 'items' => array( 'type' => 'integer', @@ -1328,19 +1328,19 @@ class WP_REST_Comments_Controller extends WP_REST_Controller { $query_params['author_email'] = array( 'default' => null, - 'description' => __( 'Limit result set to that from a specific author email. Requires authorization.' ), + 'description' => _l( 'Limit result set to that from a specific author email. Requires authorization.' ), 'format' => 'email', 'type' => 'string', ); $query_params['before'] = array( - 'description' => __( 'Limit response to comments published before a given ISO8601 compliant date.' ), + 'description' => _l( 'Limit response to comments published before a given ISO8601 compliant date.' ), 'type' => 'string', 'format' => 'date-time', ); $query_params['exclude'] = array( - 'description' => __( 'Ensure result set excludes specific IDs.' ), + 'description' => _l( 'Ensure result set excludes specific IDs.' ), 'type' => 'array', 'items' => array( 'type' => 'integer', @@ -1349,7 +1349,7 @@ class WP_REST_Comments_Controller extends WP_REST_Controller { ); $query_params['include'] = array( - 'description' => __( 'Limit result set to specific IDs.' ), + 'description' => _l( 'Limit result set to specific IDs.' ), 'type' => 'array', 'items' => array( 'type' => 'integer', @@ -1358,12 +1358,12 @@ class WP_REST_Comments_Controller extends WP_REST_Controller { ); $query_params['offset'] = array( - 'description' => __( 'Offset the result set by a specific number of items.' ), + 'description' => _l( 'Offset the result set by a specific number of items.' ), 'type' => 'integer', ); $query_params['order'] = array( - 'description' => __( 'Order sort attribute ascending or descending.' ), + 'description' => _l( 'Order sort attribute ascending or descending.' ), 'type' => 'string', 'default' => 'desc', 'enum' => array( @@ -1373,7 +1373,7 @@ class WP_REST_Comments_Controller extends WP_REST_Controller { ); $query_params['orderby'] = array( - 'description' => __( 'Sort collection by object attribute.' ), + 'description' => _l( 'Sort collection by object attribute.' ), 'type' => 'string', 'default' => 'date_gmt', 'enum' => array( @@ -1389,7 +1389,7 @@ class WP_REST_Comments_Controller extends WP_REST_Controller { $query_params['parent'] = array( 'default' => array(), - 'description' => __( 'Limit result set to comments of specific parent IDs.' ), + 'description' => _l( 'Limit result set to comments of specific parent IDs.' ), 'type' => 'array', 'items' => array( 'type' => 'integer', @@ -1398,7 +1398,7 @@ class WP_REST_Comments_Controller extends WP_REST_Controller { $query_params['parent_exclude'] = array( 'default' => array(), - 'description' => __( 'Ensure result set excludes specific parent IDs.' ), + 'description' => _l( 'Ensure result set excludes specific parent IDs.' ), 'type' => 'array', 'items' => array( 'type' => 'integer', @@ -1407,7 +1407,7 @@ class WP_REST_Comments_Controller extends WP_REST_Controller { $query_params['post'] = array( 'default' => array(), - 'description' => __( 'Limit result set to comments assigned to specific post IDs.' ), + 'description' => _l( 'Limit result set to comments assigned to specific post IDs.' ), 'type' => 'array', 'items' => array( 'type' => 'integer', @@ -1416,7 +1416,7 @@ class WP_REST_Comments_Controller extends WP_REST_Controller { $query_params['status'] = array( 'default' => 'approve', - 'description' => __( 'Limit result set to comments assigned a specific status. Requires authorization.' ), + 'description' => _l( 'Limit result set to comments assigned a specific status. Requires authorization.' ), 'sanitize_callback' => 'sanitize_key', 'type' => 'string', 'validate_callback' => 'rest_validate_request_arg', @@ -1424,14 +1424,14 @@ class WP_REST_Comments_Controller extends WP_REST_Controller { $query_params['type'] = array( 'default' => 'comment', - 'description' => __( 'Limit result set to comments assigned a specific type. Requires authorization.' ), + 'description' => _l( 'Limit result set to comments assigned a specific type. Requires authorization.' ), 'sanitize_callback' => 'sanitize_key', 'type' => 'string', 'validate_callback' => 'rest_validate_request_arg', ); $query_params['password'] = array( - 'description' => __( 'The password for the post if it is password protected.' ), + 'description' => _l( 'The password for the post if it is password protected.' ), 'type' => 'string', ); diff --git src/wp-includes/rest-api/endpoints/class-wp-rest-controller.php src/wp-includes/rest-api/endpoints/class-wp-rest-controller.php index 78c3567147..c93b2b53b3 100644 --- src/wp-includes/rest-api/endpoints/class-wp-rest-controller.php +++ src/wp-includes/rest-api/endpoints/class-wp-rest-controller.php @@ -37,7 +37,7 @@ abstract class WP_REST_Controller { */ public function register_routes() { /* translators: %s: register_routes() */ - _doing_it_wrong( 'WP_REST_Controller::register_routes', sprintf( __( "Method '%s' must be overridden." ), __METHOD__ ), '4.7' ); + _doing_it_wrong( 'WP_REST_Controller::register_routes', sprintf( _l( "Method '%s' must be overridden." ), __METHOD__ ), '4.7' ); } /** @@ -50,7 +50,7 @@ abstract class WP_REST_Controller { */ public function get_items_permissions_check( $request ) { /* translators: %s: method name */ - return new WP_Error( 'invalid-method', sprintf( __( "Method '%s' not implemented. Must be overridden in subclass." ), __METHOD__ ), array( 'status' => 405 ) ); + return new WP_Error( 'invalid-method', sprintf( _l( "Method '%s' not implemented. Must be overridden in subclass." ), __METHOD__ ), array( 'status' => 405 ) ); } /** @@ -63,7 +63,7 @@ abstract class WP_REST_Controller { */ public function get_items( $request ) { /* translators: %s: method name */ - return new WP_Error( 'invalid-method', sprintf( __( "Method '%s' not implemented. Must be overridden in subclass." ), __METHOD__ ), array( 'status' => 405 ) ); + return new WP_Error( 'invalid-method', sprintf( _l( "Method '%s' not implemented. Must be overridden in subclass." ), __METHOD__ ), array( 'status' => 405 ) ); } /** @@ -76,7 +76,7 @@ abstract class WP_REST_Controller { */ public function get_item_permissions_check( $request ) { /* translators: %s: method name */ - return new WP_Error( 'invalid-method', sprintf( __( "Method '%s' not implemented. Must be overridden in subclass." ), __METHOD__ ), array( 'status' => 405 ) ); + return new WP_Error( 'invalid-method', sprintf( _l( "Method '%s' not implemented. Must be overridden in subclass." ), __METHOD__ ), array( 'status' => 405 ) ); } /** @@ -89,7 +89,7 @@ abstract class WP_REST_Controller { */ public function get_item( $request ) { /* translators: %s: method name */ - return new WP_Error( 'invalid-method', sprintf( __( "Method '%s' not implemented. Must be overridden in subclass." ), __METHOD__ ), array( 'status' => 405 ) ); + return new WP_Error( 'invalid-method', sprintf( _l( "Method '%s' not implemented. Must be overridden in subclass." ), __METHOD__ ), array( 'status' => 405 ) ); } /** @@ -102,7 +102,7 @@ abstract class WP_REST_Controller { */ public function create_item_permissions_check( $request ) { /* translators: %s: method name */ - return new WP_Error( 'invalid-method', sprintf( __( "Method '%s' not implemented. Must be overridden in subclass." ), __METHOD__ ), array( 'status' => 405 ) ); + return new WP_Error( 'invalid-method', sprintf( _l( "Method '%s' not implemented. Must be overridden in subclass." ), __METHOD__ ), array( 'status' => 405 ) ); } /** @@ -115,7 +115,7 @@ abstract class WP_REST_Controller { */ public function create_item( $request ) { /* translators: %s: method name */ - return new WP_Error( 'invalid-method', sprintf( __( "Method '%s' not implemented. Must be overridden in subclass." ), __METHOD__ ), array( 'status' => 405 ) ); + return new WP_Error( 'invalid-method', sprintf( _l( "Method '%s' not implemented. Must be overridden in subclass." ), __METHOD__ ), array( 'status' => 405 ) ); } /** @@ -128,7 +128,7 @@ abstract class WP_REST_Controller { */ public function update_item_permissions_check( $request ) { /* translators: %s: method name */ - return new WP_Error( 'invalid-method', sprintf( __( "Method '%s' not implemented. Must be overridden in subclass." ), __METHOD__ ), array( 'status' => 405 ) ); + return new WP_Error( 'invalid-method', sprintf( _l( "Method '%s' not implemented. Must be overridden in subclass." ), __METHOD__ ), array( 'status' => 405 ) ); } /** @@ -141,7 +141,7 @@ abstract class WP_REST_Controller { */ public function update_item( $request ) { /* translators: %s: method name */ - return new WP_Error( 'invalid-method', sprintf( __( "Method '%s' not implemented. Must be overridden in subclass." ), __METHOD__ ), array( 'status' => 405 ) ); + return new WP_Error( 'invalid-method', sprintf( _l( "Method '%s' not implemented. Must be overridden in subclass." ), __METHOD__ ), array( 'status' => 405 ) ); } /** @@ -154,7 +154,7 @@ abstract class WP_REST_Controller { */ public function delete_item_permissions_check( $request ) { /* translators: %s: method name */ - return new WP_Error( 'invalid-method', sprintf( __( "Method '%s' not implemented. Must be overridden in subclass." ), __METHOD__ ), array( 'status' => 405 ) ); + return new WP_Error( 'invalid-method', sprintf( _l( "Method '%s' not implemented. Must be overridden in subclass." ), __METHOD__ ), array( 'status' => 405 ) ); } /** @@ -167,7 +167,7 @@ abstract class WP_REST_Controller { */ public function delete_item( $request ) { /* translators: %s: method name */ - return new WP_Error( 'invalid-method', sprintf( __( "Method '%s' not implemented. Must be overridden in subclass." ), __METHOD__ ), array( 'status' => 405 ) ); + return new WP_Error( 'invalid-method', sprintf( _l( "Method '%s' not implemented. Must be overridden in subclass." ), __METHOD__ ), array( 'status' => 405 ) ); } /** @@ -180,7 +180,7 @@ abstract class WP_REST_Controller { */ protected function prepare_item_for_database( $request ) { /* translators: %s: method name */ - return new WP_Error( 'invalid-method', sprintf( __( "Method '%s' not implemented. Must be overridden in subclass." ), __METHOD__ ), array( 'status' => 405 ) ); + return new WP_Error( 'invalid-method', sprintf( _l( "Method '%s' not implemented. Must be overridden in subclass." ), __METHOD__ ), array( 'status' => 405 ) ); } /** @@ -194,7 +194,7 @@ abstract class WP_REST_Controller { */ public function prepare_item_for_response( $item, $request ) { /* translators: %s: method name */ - return new WP_Error( 'invalid-method', sprintf( __( "Method '%s' not implemented. Must be overridden in subclass." ), __METHOD__ ), array( 'status' => 405 ) ); + return new WP_Error( 'invalid-method', sprintf( _l( "Method '%s' not implemented. Must be overridden in subclass." ), __METHOD__ ), array( 'status' => 405 ) ); } /** @@ -307,7 +307,7 @@ abstract class WP_REST_Controller { return array( 'context' => $this->get_context_param(), 'page' => array( - 'description' => __( 'Current page of the collection.' ), + 'description' => _l( 'Current page of the collection.' ), 'type' => 'integer', 'default' => 1, 'sanitize_callback' => 'absint', @@ -315,7 +315,7 @@ abstract class WP_REST_Controller { 'minimum' => 1, ), 'per_page' => array( - 'description' => __( 'Maximum number of items to be returned in result set.' ), + 'description' => _l( 'Maximum number of items to be returned in result set.' ), 'type' => 'integer', 'default' => 10, 'minimum' => 1, @@ -324,7 +324,7 @@ abstract class WP_REST_Controller { 'validate_callback' => 'rest_validate_request_arg', ), 'search' => array( - 'description' => __( 'Limit results to those matching a string.' ), + 'description' => _l( 'Limit results to those matching a string.' ), 'type' => 'string', 'sanitize_callback' => 'sanitize_text_field', 'validate_callback' => 'rest_validate_request_arg', @@ -344,7 +344,7 @@ abstract class WP_REST_Controller { */ public function get_context_param( $args = array() ) { $param_details = array( - 'description' => __( 'Scope under which the request is made; determines fields present in response.' ), + 'description' => _l( 'Scope under which the request is made; determines fields present in response.' ), 'type' => 'string', 'sanitize_callback' => 'sanitize_key', 'validate_callback' => 'rest_validate_request_arg', diff --git src/wp-includes/rest-api/endpoints/class-wp-rest-post-statuses-controller.php src/wp-includes/rest-api/endpoints/class-wp-rest-post-statuses-controller.php index 369cf3c757..27afb7c703 100644 --- src/wp-includes/rest-api/endpoints/class-wp-rest-post-statuses-controller.php +++ src/wp-includes/rest-api/endpoints/class-wp-rest-post-statuses-controller.php @@ -48,7 +48,7 @@ class WP_REST_Post_Statuses_Controller extends WP_REST_Controller { register_rest_route( $this->namespace, '/' . $this->rest_base . '/(?P[\w-]+)', array( 'args' => array( 'status' => array( - 'description' => __( 'An alphanumeric identifier for the status.' ), + 'description' => _l( 'An alphanumeric identifier for the status.' ), 'type' => 'string', ), ), @@ -81,7 +81,7 @@ class WP_REST_Post_Statuses_Controller extends WP_REST_Controller { return true; } } - return new WP_Error( 'rest_cannot_view', __( 'Sorry, you are not allowed to edit posts in this post type.' ), array( 'status' => rest_authorization_required_code() ) ); + return new WP_Error( 'rest_cannot_view', _l( 'Sorry, you are not allowed to edit posts in this post type.' ), array( 'status' => rest_authorization_required_code() ) ); } return true; @@ -126,13 +126,13 @@ class WP_REST_Post_Statuses_Controller extends WP_REST_Controller { $status = get_post_status_object( $request['status'] ); if ( empty( $status ) ) { - return new WP_Error( 'rest_status_invalid', __( 'Invalid status.' ), array( 'status' => 404 ) ); + return new WP_Error( 'rest_status_invalid', _l( 'Invalid status.' ), array( 'status' => 404 ) ); } $check = $this->check_read_permission( $status ); if ( ! $check ) { - return new WP_Error( 'rest_cannot_read_status', __( 'Cannot view status.' ), array( 'status' => rest_authorization_required_code() ) ); + return new WP_Error( 'rest_cannot_read_status', _l( 'Cannot view status.' ), array( 'status' => rest_authorization_required_code() ) ); } return true; @@ -176,7 +176,7 @@ class WP_REST_Post_Statuses_Controller extends WP_REST_Controller { $obj = get_post_status_object( $request['status'] ); if ( empty( $obj ) ) { - return new WP_Error( 'rest_status_invalid', __( 'Invalid status.' ), array( 'status' => 404 ) ); + return new WP_Error( 'rest_status_invalid', _l( 'Invalid status.' ), array( 'status' => 404 ) ); } $data = $this->prepare_item_for_response( $obj, $request ); @@ -245,43 +245,43 @@ class WP_REST_Post_Statuses_Controller extends WP_REST_Controller { 'type' => 'object', 'properties' => array( 'name' => array( - 'description' => __( 'The title for the status.' ), + 'description' => _l( 'The title for the status.' ), 'type' => 'string', 'context' => array( 'embed', 'view', 'edit' ), 'readonly' => true, ), 'private' => array( - 'description' => __( 'Whether posts with this status should be private.' ), + 'description' => _l( 'Whether posts with this status should be private.' ), 'type' => 'boolean', 'context' => array( 'edit' ), 'readonly' => true, ), 'protected' => array( - 'description' => __( 'Whether posts with this status should be protected.' ), + 'description' => _l( 'Whether posts with this status should be protected.' ), 'type' => 'boolean', 'context' => array( 'edit' ), 'readonly' => true, ), 'public' => array( - 'description' => __( 'Whether posts of this status should be shown in the front end of the site.' ), + 'description' => _l( 'Whether posts of this status should be shown in the front end of the site.' ), 'type' => 'boolean', 'context' => array( 'view', 'edit' ), 'readonly' => true, ), 'queryable' => array( - 'description' => __( 'Whether posts with this status should be publicly-queryable.' ), + 'description' => _l( 'Whether posts with this status should be publicly-queryable.' ), 'type' => 'boolean', 'context' => array( 'view', 'edit' ), 'readonly' => true, ), 'show_in_list' => array( - 'description' => __( 'Whether to include posts in the edit listing for their post type.' ), + 'description' => _l( 'Whether to include posts in the edit listing for their post type.' ), 'type' => 'boolean', 'context' => array( 'edit' ), 'readonly' => true, ), 'slug' => array( - 'description' => __( 'An alphanumeric identifier for the status.' ), + 'description' => _l( 'An alphanumeric identifier for the status.' ), 'type' => 'string', 'context' => array( 'embed', 'view', 'edit' ), 'readonly' => true, diff --git src/wp-includes/rest-api/endpoints/class-wp-rest-post-types-controller.php src/wp-includes/rest-api/endpoints/class-wp-rest-post-types-controller.php index c4571d9721..6840fd1de7 100644 --- src/wp-includes/rest-api/endpoints/class-wp-rest-post-types-controller.php +++ src/wp-includes/rest-api/endpoints/class-wp-rest-post-types-controller.php @@ -48,7 +48,7 @@ class WP_REST_Post_Types_Controller extends WP_REST_Controller { register_rest_route( $this->namespace, '/' . $this->rest_base . '/(?P[\w-]+)', array( 'args' => array( 'type' => array( - 'description' => __( 'An alphanumeric identifier for the post type.' ), + 'description' => _l( 'An alphanumeric identifier for the post type.' ), 'type' => 'string', ), ), @@ -79,7 +79,7 @@ class WP_REST_Post_Types_Controller extends WP_REST_Controller { } } - return new WP_Error( 'rest_cannot_view', __( 'Sorry, you are not allowed to edit posts in this post type.' ), array( 'status' => rest_authorization_required_code() ) ); + return new WP_Error( 'rest_cannot_view', _l( 'Sorry, you are not allowed to edit posts in this post type.' ), array( 'status' => rest_authorization_required_code() ) ); } return true; @@ -120,15 +120,15 @@ class WP_REST_Post_Types_Controller extends WP_REST_Controller { $obj = get_post_type_object( $request['type'] ); if ( empty( $obj ) ) { - return new WP_Error( 'rest_type_invalid', __( 'Invalid post type.' ), array( 'status' => 404 ) ); + return new WP_Error( 'rest_type_invalid', _l( 'Invalid post type.' ), array( 'status' => 404 ) ); } if ( empty( $obj->show_in_rest ) ) { - return new WP_Error( 'rest_cannot_read_type', __( 'Cannot view post type.' ), array( 'status' => rest_authorization_required_code() ) ); + return new WP_Error( 'rest_cannot_read_type', _l( 'Cannot view post type.' ), array( 'status' => rest_authorization_required_code() ) ); } if ( 'edit' === $request['context'] && ! current_user_can( $obj->cap->edit_posts ) ) { - return new WP_Error( 'rest_forbidden_context', __( 'Sorry, you are not allowed to edit posts in this post type.' ), array( 'status' => rest_authorization_required_code() ) ); + return new WP_Error( 'rest_forbidden_context', _l( 'Sorry, you are not allowed to edit posts in this post type.' ), array( 'status' => rest_authorization_required_code() ) ); } $data = $this->prepare_item_for_response( $obj, $request ); @@ -206,49 +206,49 @@ class WP_REST_Post_Types_Controller extends WP_REST_Controller { 'type' => 'object', 'properties' => array( 'capabilities' => array( - 'description' => __( 'All capabilities used by the post type.' ), + 'description' => _l( 'All capabilities used by the post type.' ), 'type' => 'object', 'context' => array( 'edit' ), 'readonly' => true, ), 'description' => array( - 'description' => __( 'A human-readable description of the post type.' ), + 'description' => _l( 'A human-readable description of the post type.' ), 'type' => 'string', 'context' => array( 'view', 'edit' ), 'readonly' => true, ), 'hierarchical' => array( - 'description' => __( 'Whether or not the post type should have children.' ), + 'description' => _l( 'Whether or not the post type should have children.' ), 'type' => 'boolean', 'context' => array( 'view', 'edit' ), 'readonly' => true, ), 'labels' => array( - 'description' => __( 'Human-readable labels for the post type for various contexts.' ), + 'description' => _l( 'Human-readable labels for the post type for various contexts.' ), 'type' => 'object', 'context' => array( 'edit' ), 'readonly' => true, ), 'name' => array( - 'description' => __( 'The title for the post type.' ), + 'description' => _l( 'The title for the post type.' ), 'type' => 'string', 'context' => array( 'view', 'edit', 'embed' ), 'readonly' => true, ), 'slug' => array( - 'description' => __( 'An alphanumeric identifier for the post type.' ), + 'description' => _l( 'An alphanumeric identifier for the post type.' ), 'type' => 'string', 'context' => array( 'view', 'edit', 'embed' ), 'readonly' => true, ), 'supports' => array( - 'description' => __( 'All features, supported by the post type.' ), + 'description' => _l( 'All features, supported by the post type.' ), 'type' => 'object', 'context' => array( 'edit' ), 'readonly' => true, ), 'taxonomies' => array( - 'description' => __( 'Taxonomies associated with post type.' ), + 'description' => _l( 'Taxonomies associated with post type.' ), 'type' => 'array', 'items' => array( 'type' => 'string', @@ -257,7 +257,7 @@ class WP_REST_Post_Types_Controller extends WP_REST_Controller { 'readonly' => true, ), 'rest_base' => array( - 'description' => __( 'REST base route for the post type.' ), + 'description' => _l( 'REST base route for the post type.' ), 'type' => 'string', 'context' => array( 'view', 'edit', 'embed' ), 'readonly' => true, diff --git src/wp-includes/rest-api/endpoints/class-wp-rest-posts-controller.php src/wp-includes/rest-api/endpoints/class-wp-rest-posts-controller.php index 80027cfea8..4522ef4bf8 100644 --- src/wp-includes/rest-api/endpoints/class-wp-rest-posts-controller.php +++ src/wp-includes/rest-api/endpoints/class-wp-rest-posts-controller.php @@ -79,14 +79,14 @@ class WP_REST_Posts_Controller extends WP_REST_Controller { ); if ( isset( $schema['properties']['password'] ) ) { $get_item_args['password'] = array( - 'description' => __( 'The password for the post if it is password protected.' ), + 'description' => _l( 'The password for the post if it is password protected.' ), 'type' => 'string', ); } register_rest_route( $this->namespace, '/' . $this->rest_base . '/(?P[\d]+)', array( 'args' => array( 'id' => array( - 'description' => __( 'Unique identifier for the object.' ), + 'description' => _l( 'Unique identifier for the object.' ), 'type' => 'integer', ), ), @@ -110,7 +110,7 @@ class WP_REST_Posts_Controller extends WP_REST_Controller { 'force' => array( 'type' => 'boolean', 'default' => false, - 'description' => __( 'Whether to bypass trash and force deletion.' ), + 'description' => _l( 'Whether to bypass trash and force deletion.' ), ), ), ), @@ -131,7 +131,7 @@ class WP_REST_Posts_Controller extends WP_REST_Controller { $post_type = get_post_type_object( $this->post_type ); if ( 'edit' === $request['context'] && ! current_user_can( $post_type->cap->edit_posts ) ) { - return new WP_Error( 'rest_forbidden_context', __( 'Sorry, you are not allowed to edit posts in this post type.' ), array( 'status' => rest_authorization_required_code() ) ); + return new WP_Error( 'rest_forbidden_context', _l( 'Sorry, you are not allowed to edit posts in this post type.' ), array( 'status' => rest_authorization_required_code() ) ); } return true; @@ -149,12 +149,12 @@ class WP_REST_Posts_Controller extends WP_REST_Controller { // Ensure a search string is set in case the orderby is set to 'relevance'. if ( ! empty( $request['orderby'] ) && 'relevance' === $request['orderby'] && empty( $request['search'] ) ) { - return new WP_Error( 'rest_no_search_term_defined', __( 'You need to define a search term to order by relevance.' ), array( 'status' => 400 ) ); + return new WP_Error( 'rest_no_search_term_defined', _l( 'You need to define a search term to order by relevance.' ), array( 'status' => 400 ) ); } // Ensure an include parameter is set in case the orderby is set to 'include'. if ( ! empty( $request['orderby'] ) && 'include' === $request['orderby'] && empty( $request['include'] ) ) { - return new WP_Error( 'rest_orderby_include_missing_include', __( 'You need to define an include parameter to order by include.' ), array( 'status' => 400 ) ); + return new WP_Error( 'rest_orderby_include_missing_include', _l( 'You need to define an include parameter to order by include.' ), array( 'status' => 400 ) ); } // Retrieve the list of registered collection query parameters. @@ -326,7 +326,7 @@ class WP_REST_Posts_Controller extends WP_REST_Controller { $max_pages = ceil( $total_posts / (int) $posts_query->query_vars['posts_per_page'] ); if ( $page > $max_pages && $total_posts > 0 ) { - return new WP_Error( 'rest_post_invalid_page_number', __( 'The page number requested is larger than the number of pages available.' ), array( 'status' => 400 ) ); + return new WP_Error( 'rest_post_invalid_page_number', _l( 'The page number requested is larger than the number of pages available.' ), array( 'status' => 400 ) ); } $response = rest_ensure_response( $posts ); @@ -366,7 +366,7 @@ class WP_REST_Posts_Controller extends WP_REST_Controller { * @return WP_Post|WP_Error Post object if ID is valid, WP_Error otherwise. */ protected function get_post( $id ) { - $error = new WP_Error( 'rest_post_invalid_id', __( 'Invalid post ID.' ), array( 'status' => 404 ) ); + $error = new WP_Error( 'rest_post_invalid_id', _l( 'Invalid post ID.' ), array( 'status' => 404 ) ); if ( (int) $id <= 0 ) { return $error; } @@ -394,13 +394,13 @@ class WP_REST_Posts_Controller extends WP_REST_Controller { } if ( 'edit' === $request['context'] && $post && ! $this->check_update_permission( $post ) ) { - return new WP_Error( 'rest_forbidden_context', __( 'Sorry, you are not allowed to edit this post.' ), array( 'status' => rest_authorization_required_code() ) ); + return new WP_Error( 'rest_forbidden_context', _l( 'Sorry, you are not allowed to edit this post.' ), array( 'status' => rest_authorization_required_code() ) ); } if ( $post && ! empty( $request['password'] ) ) { // Check post password, and return error if invalid. if ( ! hash_equals( $post->post_password, $request['password'] ) ) { - return new WP_Error( 'rest_post_incorrect_password', __( 'Incorrect post password.' ), array( 'status' => 403 ) ); + return new WP_Error( 'rest_post_incorrect_password', _l( 'Incorrect post password.' ), array( 'status' => 403 ) ); } } @@ -482,25 +482,25 @@ class WP_REST_Posts_Controller extends WP_REST_Controller { */ public function create_item_permissions_check( $request ) { if ( ! empty( $request['id'] ) ) { - return new WP_Error( 'rest_post_exists', __( 'Cannot create existing post.' ), array( 'status' => 400 ) ); + return new WP_Error( 'rest_post_exists', _l( 'Cannot create existing post.' ), array( 'status' => 400 ) ); } $post_type = get_post_type_object( $this->post_type ); if ( ! empty( $request['author'] ) && get_current_user_id() !== $request['author'] && ! current_user_can( $post_type->cap->edit_others_posts ) ) { - return new WP_Error( 'rest_cannot_edit_others', __( 'Sorry, you are not allowed to create posts as this user.' ), array( 'status' => rest_authorization_required_code() ) ); + return new WP_Error( 'rest_cannot_edit_others', _l( 'Sorry, you are not allowed to create posts as this user.' ), array( 'status' => rest_authorization_required_code() ) ); } if ( ! empty( $request['sticky'] ) && ! current_user_can( $post_type->cap->edit_others_posts ) ) { - return new WP_Error( 'rest_cannot_assign_sticky', __( 'Sorry, you are not allowed to make posts sticky.' ), array( 'status' => rest_authorization_required_code() ) ); + return new WP_Error( 'rest_cannot_assign_sticky', _l( 'Sorry, you are not allowed to make posts sticky.' ), array( 'status' => rest_authorization_required_code() ) ); } if ( ! current_user_can( $post_type->cap->create_posts ) ) { - return new WP_Error( 'rest_cannot_create', __( 'Sorry, you are not allowed to create posts as this user.' ), array( 'status' => rest_authorization_required_code() ) ); + return new WP_Error( 'rest_cannot_create', _l( 'Sorry, you are not allowed to create posts as this user.' ), array( 'status' => rest_authorization_required_code() ) ); } if ( ! $this->check_assign_terms_permission( $request ) ) { - return new WP_Error( 'rest_cannot_assign_term', __( 'Sorry, you are not allowed to assign the provided terms.' ), array( 'status' => rest_authorization_required_code() ) ); + return new WP_Error( 'rest_cannot_assign_term', _l( 'Sorry, you are not allowed to assign the provided terms.' ), array( 'status' => rest_authorization_required_code() ) ); } return true; @@ -516,7 +516,7 @@ class WP_REST_Posts_Controller extends WP_REST_Controller { */ public function create_item( $request ) { if ( ! empty( $request['id'] ) ) { - return new WP_Error( 'rest_post_exists', __( 'Cannot create existing post.' ), array( 'status' => 400 ) ); + return new WP_Error( 'rest_post_exists', _l( 'Cannot create existing post.' ), array( 'status' => 400 ) ); } $prepared_post = $this->prepare_item_for_database( $request ); @@ -626,19 +626,19 @@ class WP_REST_Posts_Controller extends WP_REST_Controller { $post_type = get_post_type_object( $this->post_type ); if ( $post && ! $this->check_update_permission( $post ) ) { - return new WP_Error( 'rest_cannot_edit', __( 'Sorry, you are not allowed to edit this post.' ), array( 'status' => rest_authorization_required_code() ) ); + return new WP_Error( 'rest_cannot_edit', _l( 'Sorry, you are not allowed to edit this post.' ), array( 'status' => rest_authorization_required_code() ) ); } if ( ! empty( $request['author'] ) && get_current_user_id() !== $request['author'] && ! current_user_can( $post_type->cap->edit_others_posts ) ) { - return new WP_Error( 'rest_cannot_edit_others', __( 'Sorry, you are not allowed to update posts as this user.' ), array( 'status' => rest_authorization_required_code() ) ); + return new WP_Error( 'rest_cannot_edit_others', _l( 'Sorry, you are not allowed to update posts as this user.' ), array( 'status' => rest_authorization_required_code() ) ); } if ( ! empty( $request['sticky'] ) && ! current_user_can( $post_type->cap->edit_others_posts ) ) { - return new WP_Error( 'rest_cannot_assign_sticky', __( 'Sorry, you are not allowed to make posts sticky.' ), array( 'status' => rest_authorization_required_code() ) ); + return new WP_Error( 'rest_cannot_assign_sticky', _l( 'Sorry, you are not allowed to make posts sticky.' ), array( 'status' => rest_authorization_required_code() ) ); } if ( ! $this->check_assign_terms_permission( $request ) ) { - return new WP_Error( 'rest_cannot_assign_term', __( 'Sorry, you are not allowed to assign the provided terms.' ), array( 'status' => rest_authorization_required_code() ) ); + return new WP_Error( 'rest_cannot_assign_term', _l( 'Sorry, you are not allowed to assign the provided terms.' ), array( 'status' => rest_authorization_required_code() ) ); } return true; @@ -746,7 +746,7 @@ class WP_REST_Posts_Controller extends WP_REST_Controller { } if ( $post && ! $this->check_delete_permission( $post ) ) { - return new WP_Error( 'rest_cannot_delete', __( 'Sorry, you are not allowed to delete this post.' ), array( 'status' => rest_authorization_required_code() ) ); + return new WP_Error( 'rest_cannot_delete', _l( 'Sorry, you are not allowed to delete this post.' ), array( 'status' => rest_authorization_required_code() ) ); } return true; @@ -790,7 +790,7 @@ class WP_REST_Posts_Controller extends WP_REST_Controller { $supports_trash = apply_filters( "rest_{$this->post_type}_trashable", $supports_trash, $post ); if ( ! $this->check_delete_permission( $post ) ) { - return new WP_Error( 'rest_user_cannot_delete_post', __( 'Sorry, you are not allowed to delete this post.' ), array( 'status' => rest_authorization_required_code() ) ); + return new WP_Error( 'rest_user_cannot_delete_post', _l( 'Sorry, you are not allowed to delete this post.' ), array( 'status' => rest_authorization_required_code() ) ); } $request->set_param( 'context', 'edit' ); @@ -806,12 +806,12 @@ class WP_REST_Posts_Controller extends WP_REST_Controller { // If we don't support trashing for this type, error out. if ( ! $supports_trash ) { /* translators: %s: force=true */ - return new WP_Error( 'rest_trash_not_supported', sprintf( __( "The post does not support trashing. Set '%s' to delete." ), 'force=true' ), array( 'status' => 501 ) ); + return new WP_Error( 'rest_trash_not_supported', sprintf( _l( "The post does not support trashing. Set '%s' to delete." ), 'force=true' ), array( 'status' => 501 ) ); } // Otherwise, only trash if we haven't already. if ( 'trash' === $post->post_status ) { - return new WP_Error( 'rest_already_trashed', __( 'The post has already been deleted.' ), array( 'status' => 410 ) ); + return new WP_Error( 'rest_already_trashed', _l( 'The post has already been deleted.' ), array( 'status' => 410 ) ); } // (Note that internally this falls through to `wp_delete_post` if @@ -822,7 +822,7 @@ class WP_REST_Posts_Controller extends WP_REST_Controller { } if ( ! $result ) { - return new WP_Error( 'rest_cannot_delete', __( 'The post cannot be deleted.' ), array( 'status' => 500 ) ); + return new WP_Error( 'rest_cannot_delete', _l( 'The post cannot be deleted.' ), array( 'status' => 500 ) ); } /** @@ -1014,7 +1014,7 @@ class WP_REST_Posts_Controller extends WP_REST_Controller { $user_obj = get_userdata( $post_author ); if ( ! $user_obj ) { - return new WP_Error( 'rest_invalid_author', __( 'Invalid author ID.' ), array( 'status' => 400 ) ); + return new WP_Error( 'rest_invalid_author', _l( 'Invalid author ID.' ), array( 'status' => 400 ) ); } } @@ -1027,18 +1027,18 @@ class WP_REST_Posts_Controller extends WP_REST_Controller { if ( '' !== $request['password'] ) { if ( ! empty( $schema['properties']['sticky'] ) && ! empty( $request['sticky'] ) ) { - return new WP_Error( 'rest_invalid_field', __( 'A post can not be sticky and have a password.' ), array( 'status' => 400 ) ); + return new WP_Error( 'rest_invalid_field', _l( 'A post can not be sticky and have a password.' ), array( 'status' => 400 ) ); } if ( ! empty( $prepared_post->ID ) && is_sticky( $prepared_post->ID ) ) { - return new WP_Error( 'rest_invalid_field', __( 'A sticky post can not be password protected.' ), array( 'status' => 400 ) ); + return new WP_Error( 'rest_invalid_field', _l( 'A sticky post can not be password protected.' ), array( 'status' => 400 ) ); } } } if ( ! empty( $schema['properties']['sticky'] ) && ! empty( $request['sticky'] ) ) { if ( ! empty( $prepared_post->ID ) && post_password_required( $prepared_post->ID ) ) { - return new WP_Error( 'rest_invalid_field', __( 'A password protected post can not be set to sticky.' ), array( 'status' => 400 ) ); + return new WP_Error( 'rest_invalid_field', _l( 'A password protected post can not be set to sticky.' ), array( 'status' => 400 ) ); } } @@ -1049,7 +1049,7 @@ class WP_REST_Posts_Controller extends WP_REST_Controller { } else { $parent = get_post( (int) $request['parent'] ); if ( empty( $parent ) ) { - return new WP_Error( 'rest_post_invalid_id', __( 'Invalid post parent ID.' ), array( 'status' => 400 ) ); + return new WP_Error( 'rest_post_invalid_id', _l( 'Invalid post parent ID.' ), array( 'status' => 400 ) ); } $prepared_post->post_parent = (int) $parent->ID; } @@ -1102,13 +1102,13 @@ class WP_REST_Posts_Controller extends WP_REST_Controller { break; case 'private': if ( ! current_user_can( $post_type->cap->publish_posts ) ) { - return new WP_Error( 'rest_cannot_publish', __( 'Sorry, you are not allowed to create private posts in this post type.' ), array( 'status' => rest_authorization_required_code() ) ); + return new WP_Error( 'rest_cannot_publish', _l( 'Sorry, you are not allowed to create private posts in this post type.' ), array( 'status' => rest_authorization_required_code() ) ); } break; case 'publish': case 'future': if ( ! current_user_can( $post_type->cap->publish_posts ) ) { - return new WP_Error( 'rest_cannot_publish', __( 'Sorry, you are not allowed to publish posts in this post type.' ), array( 'status' => rest_authorization_required_code() ) ); + return new WP_Error( 'rest_cannot_publish', _l( 'Sorry, you are not allowed to publish posts in this post type.' ), array( 'status' => rest_authorization_required_code() ) ); } break; default: @@ -1138,7 +1138,7 @@ class WP_REST_Posts_Controller extends WP_REST_Controller { if ( $result ) { return true; } else { - return new WP_Error( 'rest_invalid_featured_media', __( 'Invalid featured media ID.' ), array( 'status' => 400 ) ); + return new WP_Error( 'rest_invalid_featured_media', _l( 'Invalid featured media ID.' ), array( 'status' => 400 ) ); } } else { return delete_post_thumbnail( $post_id ); @@ -1691,31 +1691,31 @@ class WP_REST_Posts_Controller extends WP_REST_Controller { // Base properties for every Post. 'properties' => array( 'date' => array( - 'description' => __( "The date the object was published, in the site's timezone." ), + 'description' => _l( "The date the object was published, in the site's timezone." ), 'type' => 'string', 'format' => 'date-time', 'context' => array( 'view', 'edit', 'embed' ), ), 'date_gmt' => array( - 'description' => __( 'The date the object was published, as GMT.' ), + 'description' => _l( 'The date the object was published, as GMT.' ), 'type' => 'string', 'format' => 'date-time', 'context' => array( 'view', 'edit' ), ), 'guid' => array( - 'description' => __( 'The globally unique identifier for the object.' ), + 'description' => _l( 'The globally unique identifier for the object.' ), 'type' => 'object', 'context' => array( 'view', 'edit' ), 'readonly' => true, 'properties' => array( 'raw' => array( - 'description' => __( 'GUID for the object, as it exists in the database.' ), + 'description' => _l( 'GUID for the object, as it exists in the database.' ), 'type' => 'string', 'context' => array( 'edit' ), 'readonly' => true, ), 'rendered' => array( - 'description' => __( 'GUID for the object, transformed for display.' ), + 'description' => _l( 'GUID for the object, transformed for display.' ), 'type' => 'string', 'context' => array( 'view', 'edit' ), 'readonly' => true, @@ -1723,34 +1723,34 @@ class WP_REST_Posts_Controller extends WP_REST_Controller { ), ), 'id' => array( - 'description' => __( 'Unique identifier for the object.' ), + 'description' => _l( 'Unique identifier for the object.' ), 'type' => 'integer', 'context' => array( 'view', 'edit', 'embed' ), 'readonly' => true, ), 'link' => array( - 'description' => __( 'URL to the object.' ), + 'description' => _l( 'URL to the object.' ), 'type' => 'string', 'format' => 'uri', 'context' => array( 'view', 'edit', 'embed' ), 'readonly' => true, ), 'modified' => array( - 'description' => __( "The date the object was last modified, in the site's timezone." ), + 'description' => _l( "The date the object was last modified, in the site's timezone." ), 'type' => 'string', 'format' => 'date-time', 'context' => array( 'view', 'edit' ), 'readonly' => true, ), 'modified_gmt' => array( - 'description' => __( 'The date the object was last modified, as GMT.' ), + 'description' => _l( 'The date the object was last modified, as GMT.' ), 'type' => 'string', 'format' => 'date-time', 'context' => array( 'view', 'edit' ), 'readonly' => true, ), 'slug' => array( - 'description' => __( 'An alphanumeric identifier for the object unique to its type.' ), + 'description' => _l( 'An alphanumeric identifier for the object unique to its type.' ), 'type' => 'string', 'context' => array( 'view', 'edit', 'embed' ), 'arg_options' => array( @@ -1758,19 +1758,19 @@ class WP_REST_Posts_Controller extends WP_REST_Controller { ), ), 'status' => array( - 'description' => __( 'A named status for the object.' ), + 'description' => _l( 'A named status for the object.' ), 'type' => 'string', 'enum' => array_keys( get_post_stati( array( 'internal' => false ) ) ), 'context' => array( 'view', 'edit' ), ), 'type' => array( - 'description' => __( 'Type of Post for the object.' ), + 'description' => _l( 'Type of Post for the object.' ), 'type' => 'string', 'context' => array( 'view', 'edit', 'embed' ), 'readonly' => true, ), 'password' => array( - 'description' => __( 'A password to protect access to the content and excerpt.' ), + 'description' => _l( 'A password to protect access to the content and excerpt.' ), 'type' => 'string', 'context' => array( 'edit' ), ), @@ -1781,7 +1781,7 @@ class WP_REST_Posts_Controller extends WP_REST_Controller { if ( $post_type_obj->hierarchical ) { $schema['properties']['parent'] = array( - 'description' => __( 'The ID for the parent of the object.' ), + 'description' => _l( 'The ID for the parent of the object.' ), 'type' => 'integer', 'context' => array( 'view', 'edit' ), ); @@ -1841,7 +1841,7 @@ class WP_REST_Posts_Controller extends WP_REST_Controller { case 'title': $schema['properties']['title'] = array( - 'description' => __( 'The title for the object.' ), + 'description' => _l( 'The title for the object.' ), 'type' => 'object', 'context' => array( 'view', 'edit', 'embed' ), 'arg_options' => array( @@ -1850,12 +1850,12 @@ class WP_REST_Posts_Controller extends WP_REST_Controller { ), 'properties' => array( 'raw' => array( - 'description' => __( 'Title for the object, as it exists in the database.' ), + 'description' => _l( 'Title for the object, as it exists in the database.' ), 'type' => 'string', 'context' => array( 'edit' ), ), 'rendered' => array( - 'description' => __( 'HTML title for the object, transformed for display.' ), + 'description' => _l( 'HTML title for the object, transformed for display.' ), 'type' => 'string', 'context' => array( 'view', 'edit', 'embed' ), 'readonly' => true, @@ -1866,7 +1866,7 @@ class WP_REST_Posts_Controller extends WP_REST_Controller { case 'editor': $schema['properties']['content'] = array( - 'description' => __( 'The content for the object.' ), + 'description' => _l( 'The content for the object.' ), 'type' => 'object', 'context' => array( 'view', 'edit' ), 'arg_options' => array( @@ -1875,18 +1875,18 @@ class WP_REST_Posts_Controller extends WP_REST_Controller { ), 'properties' => array( 'raw' => array( - 'description' => __( 'Content for the object, as it exists in the database.' ), + 'description' => _l( 'Content for the object, as it exists in the database.' ), 'type' => 'string', 'context' => array( 'edit' ), ), 'rendered' => array( - 'description' => __( 'HTML content for the object, transformed for display.' ), + 'description' => _l( 'HTML content for the object, transformed for display.' ), 'type' => 'string', 'context' => array( 'view', 'edit' ), 'readonly' => true, ), 'protected' => array( - 'description' => __( 'Whether the content is protected with a password.' ), + 'description' => _l( 'Whether the content is protected with a password.' ), 'type' => 'boolean', 'context' => array( 'view', 'edit', 'embed' ), 'readonly' => true, @@ -1897,7 +1897,7 @@ class WP_REST_Posts_Controller extends WP_REST_Controller { case 'author': $schema['properties']['author'] = array( - 'description' => __( 'The ID for the author of the object.' ), + 'description' => _l( 'The ID for the author of the object.' ), 'type' => 'integer', 'context' => array( 'view', 'edit', 'embed' ), ); @@ -1905,7 +1905,7 @@ class WP_REST_Posts_Controller extends WP_REST_Controller { case 'excerpt': $schema['properties']['excerpt'] = array( - 'description' => __( 'The excerpt for the object.' ), + 'description' => _l( 'The excerpt for the object.' ), 'type' => 'object', 'context' => array( 'view', 'edit', 'embed' ), 'arg_options' => array( @@ -1914,18 +1914,18 @@ class WP_REST_Posts_Controller extends WP_REST_Controller { ), 'properties' => array( 'raw' => array( - 'description' => __( 'Excerpt for the object, as it exists in the database.' ), + 'description' => _l( 'Excerpt for the object, as it exists in the database.' ), 'type' => 'string', 'context' => array( 'edit' ), ), 'rendered' => array( - 'description' => __( 'HTML excerpt for the object, transformed for display.' ), + 'description' => _l( 'HTML excerpt for the object, transformed for display.' ), 'type' => 'string', 'context' => array( 'view', 'edit', 'embed' ), 'readonly' => true, ), 'protected' => array( - 'description' => __( 'Whether the excerpt is protected with a password.' ), + 'description' => _l( 'Whether the excerpt is protected with a password.' ), 'type' => 'boolean', 'context' => array( 'view', 'edit', 'embed' ), 'readonly' => true, @@ -1936,7 +1936,7 @@ class WP_REST_Posts_Controller extends WP_REST_Controller { case 'thumbnail': $schema['properties']['featured_media'] = array( - 'description' => __( 'The ID of the featured media for the object.' ), + 'description' => _l( 'The ID of the featured media for the object.' ), 'type' => 'integer', 'context' => array( 'view', 'edit', 'embed' ), ); @@ -1944,13 +1944,13 @@ class WP_REST_Posts_Controller extends WP_REST_Controller { case 'comments': $schema['properties']['comment_status'] = array( - 'description' => __( 'Whether or not comments are open on the object.' ), + 'description' => _l( 'Whether or not comments are open on the object.' ), 'type' => 'string', 'enum' => array( 'open', 'closed' ), 'context' => array( 'view', 'edit' ), ); $schema['properties']['ping_status'] = array( - 'description' => __( 'Whether or not the object can be pinged.' ), + 'description' => _l( 'Whether or not the object can be pinged.' ), 'type' => 'string', 'enum' => array( 'open', 'closed' ), 'context' => array( 'view', 'edit' ), @@ -1959,7 +1959,7 @@ class WP_REST_Posts_Controller extends WP_REST_Controller { case 'page-attributes': $schema['properties']['menu_order'] = array( - 'description' => __( 'The order of the object in relation to other object of its type.' ), + 'description' => _l( 'The order of the object in relation to other object of its type.' ), 'type' => 'integer', 'context' => array( 'view', 'edit' ), ); @@ -1970,7 +1970,7 @@ class WP_REST_Posts_Controller extends WP_REST_Controller { $formats = array_values( get_post_format_slugs() ); $schema['properties']['format'] = array( - 'description' => __( 'The format for the object.' ), + 'description' => _l( 'The format for the object.' ), 'type' => 'string', 'enum' => $formats, 'context' => array( 'view', 'edit' ), @@ -1986,14 +1986,14 @@ class WP_REST_Posts_Controller extends WP_REST_Controller { if ( 'post' === $this->post_type ) { $schema['properties']['sticky'] = array( - 'description' => __( 'Whether or not the object should be treated as sticky.' ), + 'description' => _l( 'Whether or not the object should be treated as sticky.' ), 'type' => 'boolean', 'context' => array( 'view', 'edit' ), ); } $schema['properties']['template'] = array( - 'description' => __( 'The theme file to use to display the object.' ), + 'description' => _l( 'The theme file to use to display the object.' ), 'type' => 'string', 'enum' => array_merge( array_keys( wp_get_theme()->get_page_templates( null, $this->post_type ) ), array( '' ) ), 'context' => array( 'view', 'edit' ), @@ -2004,7 +2004,7 @@ class WP_REST_Posts_Controller extends WP_REST_Controller { $base = ! empty( $taxonomy->rest_base ) ? $taxonomy->rest_base : $taxonomy->name; $schema['properties'][ $base ] = array( /* translators: %s: taxonomy name */ - 'description' => sprintf( __( 'The terms assigned to the object in the %s taxonomy.' ), $taxonomy->name ), + 'description' => sprintf( _l( 'The terms assigned to the object in the %s taxonomy.' ), $taxonomy->name ), 'type' => 'array', 'items' => array( 'type' => 'integer', @@ -2029,14 +2029,14 @@ class WP_REST_Posts_Controller extends WP_REST_Controller { $query_params['context']['default'] = 'view'; $query_params['after'] = array( - 'description' => __( 'Limit response to posts published after a given ISO8601 compliant date.' ), + 'description' => _l( 'Limit response to posts published after a given ISO8601 compliant date.' ), 'type' => 'string', 'format' => 'date-time', ); if ( post_type_supports( $this->post_type, 'author' ) ) { $query_params['author'] = array( - 'description' => __( 'Limit result set to posts assigned to specific authors.' ), + 'description' => _l( 'Limit result set to posts assigned to specific authors.' ), 'type' => 'array', 'items' => array( 'type' => 'integer', @@ -2044,7 +2044,7 @@ class WP_REST_Posts_Controller extends WP_REST_Controller { 'default' => array(), ); $query_params['author_exclude'] = array( - 'description' => __( 'Ensure result set excludes posts assigned to specific authors.' ), + 'description' => _l( 'Ensure result set excludes posts assigned to specific authors.' ), 'type' => 'array', 'items' => array( 'type' => 'integer', @@ -2054,13 +2054,13 @@ class WP_REST_Posts_Controller extends WP_REST_Controller { } $query_params['before'] = array( - 'description' => __( 'Limit response to posts published before a given ISO8601 compliant date.' ), + 'description' => _l( 'Limit response to posts published before a given ISO8601 compliant date.' ), 'type' => 'string', 'format' => 'date-time', ); $query_params['exclude'] = array( - 'description' => __( 'Ensure result set excludes specific IDs.' ), + 'description' => _l( 'Ensure result set excludes specific IDs.' ), 'type' => 'array', 'items' => array( 'type' => 'integer', @@ -2069,7 +2069,7 @@ class WP_REST_Posts_Controller extends WP_REST_Controller { ); $query_params['include'] = array( - 'description' => __( 'Limit result set to specific IDs.' ), + 'description' => _l( 'Limit result set to specific IDs.' ), 'type' => 'array', 'items' => array( 'type' => 'integer', @@ -2079,25 +2079,25 @@ class WP_REST_Posts_Controller extends WP_REST_Controller { if ( 'page' === $this->post_type || post_type_supports( $this->post_type, 'page-attributes' ) ) { $query_params['menu_order'] = array( - 'description' => __( 'Limit result set to posts with a specific menu_order value.' ), + 'description' => _l( 'Limit result set to posts with a specific menu_order value.' ), 'type' => 'integer', ); } $query_params['offset'] = array( - 'description' => __( 'Offset the result set by a specific number of items.' ), + 'description' => _l( 'Offset the result set by a specific number of items.' ), 'type' => 'integer', ); $query_params['order'] = array( - 'description' => __( 'Order sort attribute ascending or descending.' ), + 'description' => _l( 'Order sort attribute ascending or descending.' ), 'type' => 'string', 'default' => 'desc', 'enum' => array( 'asc', 'desc' ), ); $query_params['orderby'] = array( - 'description' => __( 'Sort collection by object attribute.' ), + 'description' => _l( 'Sort collection by object attribute.' ), 'type' => 'string', 'default' => 'date', 'enum' => array( @@ -2121,7 +2121,7 @@ class WP_REST_Posts_Controller extends WP_REST_Controller { if ( $post_type->hierarchical || 'attachment' === $this->post_type ) { $query_params['parent'] = array( - 'description' => __( 'Limit result set to items with particular parent IDs.' ), + 'description' => _l( 'Limit result set to items with particular parent IDs.' ), 'type' => 'array', 'items' => array( 'type' => 'integer', @@ -2129,7 +2129,7 @@ class WP_REST_Posts_Controller extends WP_REST_Controller { 'default' => array(), ); $query_params['parent_exclude'] = array( - 'description' => __( 'Limit result set to all items except those of a particular parent ID.' ), + 'description' => _l( 'Limit result set to all items except those of a particular parent ID.' ), 'type' => 'array', 'items' => array( 'type' => 'integer', @@ -2139,7 +2139,7 @@ class WP_REST_Posts_Controller extends WP_REST_Controller { } $query_params['slug'] = array( - 'description' => __( 'Limit result set to posts with one or more specific slugs.' ), + 'description' => _l( 'Limit result set to posts with one or more specific slugs.' ), 'type' => 'array', 'items' => array( 'type' => 'string', @@ -2149,7 +2149,7 @@ class WP_REST_Posts_Controller extends WP_REST_Controller { $query_params['status'] = array( 'default' => 'publish', - 'description' => __( 'Limit result set to posts assigned one or more statuses.' ), + 'description' => _l( 'Limit result set to posts assigned one or more statuses.' ), 'type' => 'array', 'items' => array( 'enum' => array_merge( array_keys( get_post_stati() ), array( 'any' ) ), @@ -2165,7 +2165,7 @@ class WP_REST_Posts_Controller extends WP_REST_Controller { $query_params[ $base ] = array( /* translators: %s: taxonomy name */ - 'description' => sprintf( __( 'Limit result set to all items that have the specified term assigned in the %s taxonomy.' ), $base ), + 'description' => sprintf( _l( 'Limit result set to all items that have the specified term assigned in the %s taxonomy.' ), $base ), 'type' => 'array', 'items' => array( 'type' => 'integer', @@ -2175,7 +2175,7 @@ class WP_REST_Posts_Controller extends WP_REST_Controller { $query_params[ $base . '_exclude' ] = array( /* translators: %s: taxonomy name */ - 'description' => sprintf( __( 'Limit result set to all items except those that have the specified term assigned in the %s taxonomy.' ), $base ), + 'description' => sprintf( _l( 'Limit result set to all items except those that have the specified term assigned in the %s taxonomy.' ), $base ), 'type' => 'array', 'items' => array( 'type' => 'integer', @@ -2186,7 +2186,7 @@ class WP_REST_Posts_Controller extends WP_REST_Controller { if ( 'post' === $this->post_type ) { $query_params['sticky'] = array( - 'description' => __( 'Limit result set to items that are sticky.' ), + 'description' => _l( 'Limit result set to items that are sticky.' ), 'type' => 'boolean', ); } @@ -2240,7 +2240,7 @@ class WP_REST_Posts_Controller extends WP_REST_Controller { return $result; } } else { - return new WP_Error( 'rest_forbidden_status', __( 'Status is forbidden.' ), array( 'status' => rest_authorization_required_code() ) ); + return new WP_Error( 'rest_forbidden_status', _l( 'Status is forbidden.' ), array( 'status' => rest_authorization_required_code() ) ); } } diff --git src/wp-includes/rest-api/endpoints/class-wp-rest-revisions-controller.php src/wp-includes/rest-api/endpoints/class-wp-rest-revisions-controller.php index a648fa2de5..8cc7d94ab9 100644 --- src/wp-includes/rest-api/endpoints/class-wp-rest-revisions-controller.php +++ src/wp-includes/rest-api/endpoints/class-wp-rest-revisions-controller.php @@ -68,7 +68,7 @@ class WP_REST_Revisions_Controller extends WP_REST_Controller { register_rest_route( $this->namespace, '/' . $this->parent_base . '/(?P[\d]+)/' . $this->rest_base, array( 'args' => array( 'parent' => array( - 'description' => __( 'The ID for the parent of the object.' ), + 'description' => _l( 'The ID for the parent of the object.' ), 'type' => 'integer', ), ), @@ -84,11 +84,11 @@ class WP_REST_Revisions_Controller extends WP_REST_Controller { register_rest_route( $this->namespace, '/' . $this->parent_base . '/(?P[\d]+)/' . $this->rest_base . '/(?P[\d]+)', array( 'args' => array( 'parent' => array( - 'description' => __( 'The ID for the parent of the object.' ), + 'description' => _l( 'The ID for the parent of the object.' ), 'type' => 'integer', ), 'id' => array( - 'description' => __( 'Unique identifier for the object.' ), + 'description' => _l( 'Unique identifier for the object.' ), 'type' => 'integer', ), ), @@ -108,7 +108,7 @@ class WP_REST_Revisions_Controller extends WP_REST_Controller { 'force' => array( 'type' => 'boolean', 'default' => false, - 'description' => __( 'Required to be true, as revisions do not support trashing.' ), + 'description' => _l( 'Required to be true, as revisions do not support trashing.' ), ), ), ), @@ -126,7 +126,7 @@ class WP_REST_Revisions_Controller extends WP_REST_Controller { * @return WP_Post|WP_Error Post object if ID is valid, WP_Error otherwise. */ protected function get_parent( $parent ) { - $error = new WP_Error( 'rest_post_invalid_parent', __( 'Invalid post parent ID.' ), array( 'status' => 404 ) ); + $error = new WP_Error( 'rest_post_invalid_parent', _l( 'Invalid post parent ID.' ), array( 'status' => 404 ) ); if ( (int) $parent <= 0 ) { return $error; } @@ -155,7 +155,7 @@ class WP_REST_Revisions_Controller extends WP_REST_Controller { $parent_post_type_obj = get_post_type_object( $parent->post_type ); if ( ! current_user_can( $parent_post_type_obj->cap->edit_post, $parent->ID ) ) { - return new WP_Error( 'rest_cannot_read', __( 'Sorry, you are not allowed to view revisions of this post.' ), array( 'status' => rest_authorization_required_code() ) ); + return new WP_Error( 'rest_cannot_read', _l( 'Sorry, you are not allowed to view revisions of this post.' ), array( 'status' => rest_authorization_required_code() ) ); } return true; @@ -170,7 +170,7 @@ class WP_REST_Revisions_Controller extends WP_REST_Controller { * @return WP_Post|WP_Error Revision post object if ID is valid, WP_Error otherwise. */ protected function get_revision( $id ) { - $error = new WP_Error( 'rest_post_invalid_id', __( 'Invalid revision ID.' ), array( 'status' => 404 ) ); + $error = new WP_Error( 'rest_post_invalid_id', _l( 'Invalid revision ID.' ), array( 'status' => 404 ) ); if ( (int) $id <= 0 ) { return $error; } @@ -289,7 +289,7 @@ class WP_REST_Revisions_Controller extends WP_REST_Controller { // We don't support trashing for revisions. if ( ! $force ) { /* translators: %s: force=true */ - return new WP_Error( 'rest_trash_not_supported', sprintf( __( "Revisions do not support trashing. Set '%s' to delete." ), 'force=true' ), array( 'status' => 501 ) ); + return new WP_Error( 'rest_trash_not_supported', sprintf( _l( "Revisions do not support trashing. Set '%s' to delete." ), 'force=true' ), array( 'status' => 501 ) ); } $previous = $this->prepare_item_for_response( $revision, $request ); @@ -309,7 +309,7 @@ class WP_REST_Revisions_Controller extends WP_REST_Controller { do_action( 'rest_delete_revision', $result, $request ); if ( ! $result ) { - return new WP_Error( 'rest_cannot_delete', __( 'The post cannot be deleted.' ), array( 'status' => 500 ) ); + return new WP_Error( 'rest_cannot_delete', _l( 'The post cannot be deleted.' ), array( 'status' => 500 ) ); } $response = new WP_REST_Response(); @@ -458,51 +458,51 @@ class WP_REST_Revisions_Controller extends WP_REST_Controller { // Base properties for every Revision. 'properties' => array( 'author' => array( - 'description' => __( 'The ID for the author of the object.' ), + 'description' => _l( 'The ID for the author of the object.' ), 'type' => 'integer', 'context' => array( 'view', 'edit', 'embed' ), ), 'date' => array( - 'description' => __( "The date the object was published, in the site's timezone." ), + 'description' => _l( "The date the object was published, in the site's timezone." ), 'type' => 'string', 'format' => 'date-time', 'context' => array( 'view', 'edit', 'embed' ), ), 'date_gmt' => array( - 'description' => __( 'The date the object was published, as GMT.' ), + 'description' => _l( 'The date the object was published, as GMT.' ), 'type' => 'string', 'format' => 'date-time', 'context' => array( 'view', 'edit' ), ), 'guid' => array( - 'description' => __( 'GUID for the object, as it exists in the database.' ), + 'description' => _l( 'GUID for the object, as it exists in the database.' ), 'type' => 'string', 'context' => array( 'view', 'edit' ), ), 'id' => array( - 'description' => __( 'Unique identifier for the object.' ), + 'description' => _l( 'Unique identifier for the object.' ), 'type' => 'integer', 'context' => array( 'view', 'edit', 'embed' ), ), 'modified' => array( - 'description' => __( "The date the object was last modified, in the site's timezone." ), + 'description' => _l( "The date the object was last modified, in the site's timezone." ), 'type' => 'string', 'format' => 'date-time', 'context' => array( 'view', 'edit' ), ), 'modified_gmt' => array( - 'description' => __( 'The date the object was last modified, as GMT.' ), + 'description' => _l( 'The date the object was last modified, as GMT.' ), 'type' => 'string', 'format' => 'date-time', 'context' => array( 'view', 'edit' ), ), 'parent' => array( - 'description' => __( 'The ID for the parent of the object.' ), + 'description' => _l( 'The ID for the parent of the object.' ), 'type' => 'integer', 'context' => array( 'view', 'edit', 'embed' ), ), 'slug' => array( - 'description' => __( 'An alphanumeric identifier for the object unique to its type.' ), + 'description' => _l( 'An alphanumeric identifier for the object unique to its type.' ), 'type' => 'string', 'context' => array( 'view', 'edit', 'embed' ), ), diff --git src/wp-includes/rest-api/endpoints/class-wp-rest-settings-controller.php src/wp-includes/rest-api/endpoints/class-wp-rest-settings-controller.php index 17a01b8ba6..82bf524395 100644 --- src/wp-includes/rest-api/endpoints/class-wp-rest-settings-controller.php +++ src/wp-includes/rest-api/endpoints/class-wp-rest-settings-controller.php @@ -194,7 +194,7 @@ class WP_REST_Settings_Controller extends WP_REST_Controller { */ if ( ! is_scalar( get_option( $args['option_name'], false ) ) ) { return new WP_Error( - 'rest_invalid_stored_value', sprintf( __( 'The %s property has an invalid stored value, and cannot be updated to null.' ), $name ), array( 'status' => 500 ) + 'rest_invalid_stored_value', sprintf( _l( 'The %s property has an invalid stored value, and cannot be updated to null.' ), $name ), array( 'status' => 500 ) ); } diff --git src/wp-includes/rest-api/endpoints/class-wp-rest-taxonomies-controller.php src/wp-includes/rest-api/endpoints/class-wp-rest-taxonomies-controller.php index ea97135677..e3c8d99cd3 100644 --- src/wp-includes/rest-api/endpoints/class-wp-rest-taxonomies-controller.php +++ src/wp-includes/rest-api/endpoints/class-wp-rest-taxonomies-controller.php @@ -48,7 +48,7 @@ class WP_REST_Taxonomies_Controller extends WP_REST_Controller { register_rest_route( $this->namespace, '/' . $this->rest_base . '/(?P[\w-]+)', array( 'args' => array( 'taxonomy' => array( - 'description' => __( 'An alphanumeric identifier for the taxonomy.' ), + 'description' => _l( 'An alphanumeric identifier for the taxonomy.' ), 'type' => 'string', ), ), @@ -84,7 +84,7 @@ class WP_REST_Taxonomies_Controller extends WP_REST_Controller { return true; } } - return new WP_Error( 'rest_cannot_view', __( 'Sorry, you are not allowed to manage terms in this taxonomy.' ), array( 'status' => rest_authorization_required_code() ) ); + return new WP_Error( 'rest_cannot_view', _l( 'Sorry, you are not allowed to manage terms in this taxonomy.' ), array( 'status' => rest_authorization_required_code() ) ); } return true; } @@ -142,7 +142,7 @@ class WP_REST_Taxonomies_Controller extends WP_REST_Controller { return false; } if ( 'edit' === $request['context'] && ! current_user_can( $tax_obj->cap->manage_terms ) ) { - return new WP_Error( 'rest_forbidden_context', __( 'Sorry, you are not allowed to manage terms in this taxonomy.' ), array( 'status' => rest_authorization_required_code() ) ); + return new WP_Error( 'rest_forbidden_context', _l( 'Sorry, you are not allowed to manage terms in this taxonomy.' ), array( 'status' => rest_authorization_required_code() ) ); } } @@ -160,7 +160,7 @@ class WP_REST_Taxonomies_Controller extends WP_REST_Controller { public function get_item( $request ) { $tax_obj = get_taxonomy( $request['taxonomy'] ); if ( empty( $tax_obj ) ) { - return new WP_Error( 'rest_taxonomy_invalid', __( 'Invalid taxonomy.' ), array( 'status' => 404 ) ); + return new WP_Error( 'rest_taxonomy_invalid', _l( 'Invalid taxonomy.' ), array( 'status' => 404 ) ); } $data = $this->prepare_item_for_response( $tax_obj, $request ); return rest_ensure_response( $data ); @@ -233,49 +233,49 @@ class WP_REST_Taxonomies_Controller extends WP_REST_Controller { 'type' => 'object', 'properties' => array( 'capabilities' => array( - 'description' => __( 'All capabilities used by the taxonomy.' ), + 'description' => _l( 'All capabilities used by the taxonomy.' ), 'type' => 'object', 'context' => array( 'edit' ), 'readonly' => true, ), 'description' => array( - 'description' => __( 'A human-readable description of the taxonomy.' ), + 'description' => _l( 'A human-readable description of the taxonomy.' ), 'type' => 'string', 'context' => array( 'view', 'edit' ), 'readonly' => true, ), 'hierarchical' => array( - 'description' => __( 'Whether or not the taxonomy should have children.' ), + 'description' => _l( 'Whether or not the taxonomy should have children.' ), 'type' => 'boolean', 'context' => array( 'view', 'edit' ), 'readonly' => true, ), 'labels' => array( - 'description' => __( 'Human-readable labels for the taxonomy for various contexts.' ), + 'description' => _l( 'Human-readable labels for the taxonomy for various contexts.' ), 'type' => 'object', 'context' => array( 'edit' ), 'readonly' => true, ), 'name' => array( - 'description' => __( 'The title for the taxonomy.' ), + 'description' => _l( 'The title for the taxonomy.' ), 'type' => 'string', 'context' => array( 'view', 'edit', 'embed' ), 'readonly' => true, ), 'slug' => array( - 'description' => __( 'An alphanumeric identifier for the taxonomy.' ), + 'description' => _l( 'An alphanumeric identifier for the taxonomy.' ), 'type' => 'string', 'context' => array( 'view', 'edit', 'embed' ), 'readonly' => true, ), 'show_cloud' => array( - 'description' => __( 'Whether or not the term cloud should be displayed.' ), + 'description' => _l( 'Whether or not the term cloud should be displayed.' ), 'type' => 'boolean', 'context' => array( 'edit' ), 'readonly' => true, ), 'types' => array( - 'description' => __( 'Types associated with the taxonomy.' ), + 'description' => _l( 'Types associated with the taxonomy.' ), 'type' => 'array', 'items' => array( 'type' => 'string', @@ -284,7 +284,7 @@ class WP_REST_Taxonomies_Controller extends WP_REST_Controller { 'readonly' => true, ), 'rest_base' => array( - 'description' => __( 'REST base route for the taxonomy.' ), + 'description' => _l( 'REST base route for the taxonomy.' ), 'type' => 'string', 'context' => array( 'view', 'edit', 'embed' ), 'readonly' => true, @@ -305,7 +305,7 @@ class WP_REST_Taxonomies_Controller extends WP_REST_Controller { $new_params = array(); $new_params['context'] = $this->get_context_param( array( 'default' => 'view' ) ); $new_params['type'] = array( - 'description' => __( 'Limit results to taxonomies associated with a specific post type.' ), + 'description' => _l( 'Limit results to taxonomies associated with a specific post type.' ), 'type' => 'string', ); return $new_params; diff --git src/wp-includes/rest-api/endpoints/class-wp-rest-terms-controller.php src/wp-includes/rest-api/endpoints/class-wp-rest-terms-controller.php index ca0f53263a..f6f81b3e15 100644 --- src/wp-includes/rest-api/endpoints/class-wp-rest-terms-controller.php +++ src/wp-includes/rest-api/endpoints/class-wp-rest-terms-controller.php @@ -92,7 +92,7 @@ class WP_REST_Terms_Controller extends WP_REST_Controller { register_rest_route( $this->namespace, '/' . $this->rest_base . '/(?P[\d]+)', array( 'args' => array( 'id' => array( - 'description' => __( 'Unique identifier for the term.' ), + 'description' => _l( 'Unique identifier for the term.' ), 'type' => 'integer', ), ), @@ -118,7 +118,7 @@ class WP_REST_Terms_Controller extends WP_REST_Controller { 'force' => array( 'type' => 'boolean', 'default' => false, - 'description' => __( 'Required to be true, as terms do not support trashing.' ), + 'description' => _l( 'Required to be true, as terms do not support trashing.' ), ), ), ), @@ -140,7 +140,7 @@ class WP_REST_Terms_Controller extends WP_REST_Controller { return false; } if ( 'edit' === $request['context'] && ! current_user_can( $tax_obj->cap->edit_terms ) ) { - return new WP_Error( 'rest_forbidden_context', __( 'Sorry, you are not allowed to edit terms in this taxonomy.' ), array( 'status' => rest_authorization_required_code() ) ); + return new WP_Error( 'rest_forbidden_context', _l( 'Sorry, you are not allowed to edit terms in this taxonomy.' ), array( 'status' => rest_authorization_required_code() ) ); } return true; } @@ -294,7 +294,7 @@ class WP_REST_Terms_Controller extends WP_REST_Controller { * @return WP_Term|WP_Error Term object if ID is valid, WP_Error otherwise. */ protected function get_term( $id ) { - $error = new WP_Error( 'rest_term_invalid', __( 'Term does not exist.' ), array( 'status' => 404 ) ); + $error = new WP_Error( 'rest_term_invalid', _l( 'Term does not exist.' ), array( 'status' => 404 ) ); if ( ! $this->check_is_taxonomy_allowed( $this->taxonomy ) ) { return $error; @@ -327,7 +327,7 @@ class WP_REST_Terms_Controller extends WP_REST_Controller { } if ( 'edit' === $request['context'] && ! current_user_can( 'edit_term', $term->term_id ) ) { - return new WP_Error( 'rest_forbidden_context', __( 'Sorry, you are not allowed to edit this term.' ), array( 'status' => rest_authorization_required_code() ) ); + return new WP_Error( 'rest_forbidden_context', _l( 'Sorry, you are not allowed to edit this term.' ), array( 'status' => rest_authorization_required_code() ) ); } return true; } @@ -367,7 +367,7 @@ class WP_REST_Terms_Controller extends WP_REST_Controller { $taxonomy_obj = get_taxonomy( $this->taxonomy ); if ( ! current_user_can( $taxonomy_obj->cap->edit_terms ) ) { - return new WP_Error( 'rest_cannot_create', __( 'Sorry, you are not allowed to create new terms.' ), array( 'status' => rest_authorization_required_code() ) ); + return new WP_Error( 'rest_cannot_create', _l( 'Sorry, you are not allowed to create new terms.' ), array( 'status' => rest_authorization_required_code() ) ); } return true; @@ -384,13 +384,13 @@ class WP_REST_Terms_Controller extends WP_REST_Controller { public function create_item( $request ) { if ( isset( $request['parent'] ) ) { if ( ! is_taxonomy_hierarchical( $this->taxonomy ) ) { - return new WP_Error( 'rest_taxonomy_not_hierarchical', __( 'Cannot set parent term, taxonomy is not hierarchical.' ), array( 'status' => 400 ) ); + return new WP_Error( 'rest_taxonomy_not_hierarchical', _l( 'Cannot set parent term, taxonomy is not hierarchical.' ), array( 'status' => 400 ) ); } $parent = get_term( (int) $request['parent'], $this->taxonomy ); if ( ! $parent ) { - return new WP_Error( 'rest_term_invalid', __( 'Parent term does not exist.' ), array( 'status' => 400 ) ); + return new WP_Error( 'rest_term_invalid', _l( 'Parent term does not exist.' ), array( 'status' => 400 ) ); } } @@ -466,7 +466,7 @@ class WP_REST_Terms_Controller extends WP_REST_Controller { } if ( ! current_user_can( 'edit_term', $term->term_id ) ) { - return new WP_Error( 'rest_cannot_update', __( 'Sorry, you are not allowed to edit this term.' ), array( 'status' => rest_authorization_required_code() ) ); + return new WP_Error( 'rest_cannot_update', _l( 'Sorry, you are not allowed to edit this term.' ), array( 'status' => rest_authorization_required_code() ) ); } return true; @@ -488,13 +488,13 @@ class WP_REST_Terms_Controller extends WP_REST_Controller { if ( isset( $request['parent'] ) ) { if ( ! is_taxonomy_hierarchical( $this->taxonomy ) ) { - return new WP_Error( 'rest_taxonomy_not_hierarchical', __( 'Cannot set parent term, taxonomy is not hierarchical.' ), array( 'status' => 400 ) ); + return new WP_Error( 'rest_taxonomy_not_hierarchical', _l( 'Cannot set parent term, taxonomy is not hierarchical.' ), array( 'status' => 400 ) ); } $parent = get_term( (int) $request['parent'], $this->taxonomy ); if ( ! $parent ) { - return new WP_Error( 'rest_term_invalid', __( 'Parent term does not exist.' ), array( 'status' => 400 ) ); + return new WP_Error( 'rest_term_invalid', _l( 'Parent term does not exist.' ), array( 'status' => 400 ) ); } } @@ -551,7 +551,7 @@ class WP_REST_Terms_Controller extends WP_REST_Controller { } if ( ! current_user_can( 'delete_term', $term->term_id ) ) { - return new WP_Error( 'rest_cannot_delete', __( 'Sorry, you are not allowed to delete this term.' ), array( 'status' => rest_authorization_required_code() ) ); + return new WP_Error( 'rest_cannot_delete', _l( 'Sorry, you are not allowed to delete this term.' ), array( 'status' => rest_authorization_required_code() ) ); } return true; @@ -576,7 +576,7 @@ class WP_REST_Terms_Controller extends WP_REST_Controller { // We don't support trashing for terms. if ( ! $force ) { /* translators: %s: force=true */ - return new WP_Error( 'rest_trash_not_supported', sprintf( __( "Terms do not support trashing. Set '%s' to delete." ), 'force=true' ), array( 'status' => 501 ) ); + return new WP_Error( 'rest_trash_not_supported', sprintf( _l( "Terms do not support trashing. Set '%s' to delete." ), 'force=true' ), array( 'status' => 501 ) ); } $request->set_param( 'context', 'view' ); @@ -586,7 +586,7 @@ class WP_REST_Terms_Controller extends WP_REST_Controller { $retval = wp_delete_term( $term->term_id, $term->taxonomy ); if ( ! $retval ) { - return new WP_Error( 'rest_cannot_delete', __( 'The term cannot be deleted.' ), array( 'status' => 500 ) ); + return new WP_Error( 'rest_cannot_delete', _l( 'The term cannot be deleted.' ), array( 'status' => 500 ) ); } $response = new WP_REST_Response(); @@ -809,31 +809,31 @@ class WP_REST_Terms_Controller extends WP_REST_Controller { 'type' => 'object', 'properties' => array( 'id' => array( - 'description' => __( 'Unique identifier for the term.' ), + 'description' => _l( 'Unique identifier for the term.' ), 'type' => 'integer', 'context' => array( 'view', 'embed', 'edit' ), 'readonly' => true, ), 'count' => array( - 'description' => __( 'Number of published posts for the term.' ), + 'description' => _l( 'Number of published posts for the term.' ), 'type' => 'integer', 'context' => array( 'view', 'edit' ), 'readonly' => true, ), 'description' => array( - 'description' => __( 'HTML description of the term.' ), + 'description' => _l( 'HTML description of the term.' ), 'type' => 'string', 'context' => array( 'view', 'edit' ), ), 'link' => array( - 'description' => __( 'URL of the term.' ), + 'description' => _l( 'URL of the term.' ), 'type' => 'string', 'format' => 'uri', 'context' => array( 'view', 'embed', 'edit' ), 'readonly' => true, ), 'name' => array( - 'description' => __( 'HTML title for the term.' ), + 'description' => _l( 'HTML title for the term.' ), 'type' => 'string', 'context' => array( 'view', 'embed', 'edit' ), 'arg_options' => array( @@ -842,7 +842,7 @@ class WP_REST_Terms_Controller extends WP_REST_Controller { 'required' => true, ), 'slug' => array( - 'description' => __( 'An alphanumeric identifier for the term unique to its type.' ), + 'description' => _l( 'An alphanumeric identifier for the term unique to its type.' ), 'type' => 'string', 'context' => array( 'view', 'embed', 'edit' ), 'arg_options' => array( @@ -850,7 +850,7 @@ class WP_REST_Terms_Controller extends WP_REST_Controller { ), ), 'taxonomy' => array( - 'description' => __( 'Type attribution for the term.' ), + 'description' => _l( 'Type attribution for the term.' ), 'type' => 'string', 'enum' => array_keys( get_taxonomies() ), 'context' => array( 'view', 'embed', 'edit' ), @@ -863,7 +863,7 @@ class WP_REST_Terms_Controller extends WP_REST_Controller { if ( $taxonomy->hierarchical ) { $schema['properties']['parent'] = array( - 'description' => __( 'The parent term ID.' ), + 'description' => _l( 'The parent term ID.' ), 'type' => 'integer', 'context' => array( 'view', 'edit' ), ); @@ -888,7 +888,7 @@ class WP_REST_Terms_Controller extends WP_REST_Controller { $query_params['context']['default'] = 'view'; $query_params['exclude'] = array( - 'description' => __( 'Ensure result set excludes specific IDs.' ), + 'description' => _l( 'Ensure result set excludes specific IDs.' ), 'type' => 'array', 'items' => array( 'type' => 'integer', @@ -897,7 +897,7 @@ class WP_REST_Terms_Controller extends WP_REST_Controller { ); $query_params['include'] = array( - 'description' => __( 'Limit result set to specific IDs.' ), + 'description' => _l( 'Limit result set to specific IDs.' ), 'type' => 'array', 'items' => array( 'type' => 'integer', @@ -907,13 +907,13 @@ class WP_REST_Terms_Controller extends WP_REST_Controller { if ( ! $taxonomy->hierarchical ) { $query_params['offset'] = array( - 'description' => __( 'Offset the result set by a specific number of items.' ), + 'description' => _l( 'Offset the result set by a specific number of items.' ), 'type' => 'integer', ); } $query_params['order'] = array( - 'description' => __( 'Order sort attribute ascending or descending.' ), + 'description' => _l( 'Order sort attribute ascending or descending.' ), 'type' => 'string', 'default' => 'asc', 'enum' => array( @@ -923,7 +923,7 @@ class WP_REST_Terms_Controller extends WP_REST_Controller { ); $query_params['orderby'] = array( - 'description' => __( 'Sort collection by term attribute.' ), + 'description' => _l( 'Sort collection by term attribute.' ), 'type' => 'string', 'default' => 'name', 'enum' => array( @@ -938,26 +938,26 @@ class WP_REST_Terms_Controller extends WP_REST_Controller { ); $query_params['hide_empty'] = array( - 'description' => __( 'Whether to hide terms not assigned to any posts.' ), + 'description' => _l( 'Whether to hide terms not assigned to any posts.' ), 'type' => 'boolean', 'default' => false, ); if ( $taxonomy->hierarchical ) { $query_params['parent'] = array( - 'description' => __( 'Limit result set to terms assigned to a specific parent.' ), + 'description' => _l( 'Limit result set to terms assigned to a specific parent.' ), 'type' => 'integer', ); } $query_params['post'] = array( - 'description' => __( 'Limit result set to terms assigned to a specific post.' ), + 'description' => _l( 'Limit result set to terms assigned to a specific post.' ), 'type' => 'integer', 'default' => null, ); $query_params['slug'] = array( - 'description' => __( 'Limit result set to terms with one or more specific slugs.' ), + 'description' => _l( 'Limit result set to terms with one or more specific slugs.' ), 'type' => 'array', 'items' => array( 'type' => 'string' diff --git src/wp-includes/rest-api/endpoints/class-wp-rest-users-controller.php src/wp-includes/rest-api/endpoints/class-wp-rest-users-controller.php index 372c9654de..e2ade568df 100644 --- src/wp-includes/rest-api/endpoints/class-wp-rest-users-controller.php +++ src/wp-includes/rest-api/endpoints/class-wp-rest-users-controller.php @@ -64,7 +64,7 @@ class WP_REST_Users_Controller extends WP_REST_Controller { register_rest_route( $this->namespace, '/' . $this->rest_base . '/(?P[\d]+)', array( 'args' => array( 'id' => array( - 'description' => __( 'Unique identifier for the user.' ), + 'description' => _l( 'Unique identifier for the user.' ), 'type' => 'integer', ), ), @@ -90,11 +90,11 @@ class WP_REST_Users_Controller extends WP_REST_Controller { 'force' => array( 'type' => 'boolean', 'default' => false, - 'description' => __( 'Required to be true, as users do not support trashing.' ), + 'description' => _l( 'Required to be true, as users do not support trashing.' ), ), 'reassign' => array( 'type' => 'integer', - 'description' => __( 'Reassign the deleted user\'s posts and links to this user ID.' ), + 'description' => _l( 'Reassign the deleted user\'s posts and links to this user ID.' ), 'required' => true, 'sanitize_callback' => array( $this, 'check_reassign' ), ), @@ -125,11 +125,11 @@ class WP_REST_Users_Controller extends WP_REST_Controller { 'force' => array( 'type' => 'boolean', 'default' => false, - 'description' => __( 'Required to be true, as users do not support trashing.' ), + 'description' => _l( 'Required to be true, as users do not support trashing.' ), ), 'reassign' => array( 'type' => 'integer', - 'description' => __( 'Reassign the deleted user\'s posts and links to this user ID.' ), + 'description' => _l( 'Reassign the deleted user\'s posts and links to this user ID.' ), 'required' => true, 'sanitize_callback' => array( $this, 'check_reassign' ), ), @@ -161,7 +161,7 @@ class WP_REST_Users_Controller extends WP_REST_Controller { return false; } - return new WP_Error( 'rest_invalid_param', __( 'Invalid user parameter(s).' ), array( 'status' => 400 ) ); + return new WP_Error( 'rest_invalid_param', _l( 'Invalid user parameter(s).' ), array( 'status' => 400 ) ); } /** @@ -175,15 +175,15 @@ class WP_REST_Users_Controller extends WP_REST_Controller { public function get_items_permissions_check( $request ) { // Check if roles is specified in GET request and if user can list users. if ( ! empty( $request['roles'] ) && ! current_user_can( 'list_users' ) ) { - return new WP_Error( 'rest_user_cannot_view', __( 'Sorry, you are not allowed to filter users by role.' ), array( 'status' => rest_authorization_required_code() ) ); + return new WP_Error( 'rest_user_cannot_view', _l( 'Sorry, you are not allowed to filter users by role.' ), array( 'status' => rest_authorization_required_code() ) ); } if ( 'edit' === $request['context'] && ! current_user_can( 'list_users' ) ) { - return new WP_Error( 'rest_forbidden_context', __( 'Sorry, you are not allowed to list users.' ), array( 'status' => rest_authorization_required_code() ) ); + return new WP_Error( 'rest_forbidden_context', _l( 'Sorry, you are not allowed to list users.' ), array( 'status' => rest_authorization_required_code() ) ); } if ( in_array( $request['orderby'], array( 'email', 'registered_date' ), true ) && ! current_user_can( 'list_users' ) ) { - return new WP_Error( 'rest_forbidden_orderby', __( 'Sorry, you are not allowed to order users by this parameter.' ), array( 'status' => rest_authorization_required_code() ) ); + return new WP_Error( 'rest_forbidden_orderby', _l( 'Sorry, you are not allowed to order users by this parameter.' ), array( 'status' => rest_authorization_required_code() ) ); } return true; @@ -330,7 +330,7 @@ class WP_REST_Users_Controller extends WP_REST_Controller { * @return WP_User|WP_Error True if ID is valid, WP_Error otherwise. */ protected function get_user( $id ) { - $error = new WP_Error( 'rest_user_invalid_id', __( 'Invalid user ID.' ), array( 'status' => 404 ) ); + $error = new WP_Error( 'rest_user_invalid_id', _l( 'Invalid user ID.' ), array( 'status' => 404 ) ); if ( (int) $id <= 0 ) { return $error; } @@ -368,9 +368,9 @@ class WP_REST_Users_Controller extends WP_REST_Controller { } if ( 'edit' === $request['context'] && ! current_user_can( 'list_users' ) ) { - return new WP_Error( 'rest_user_cannot_view', __( 'Sorry, you are not allowed to list users.' ), array( 'status' => rest_authorization_required_code() ) ); + return new WP_Error( 'rest_user_cannot_view', _l( 'Sorry, you are not allowed to list users.' ), array( 'status' => rest_authorization_required_code() ) ); } elseif ( ! count_user_posts( $user->ID, $types ) && ! current_user_can( 'edit_user', $user->ID ) && ! current_user_can( 'list_users' ) ) { - return new WP_Error( 'rest_user_cannot_view', __( 'Sorry, you are not allowed to list users.' ), array( 'status' => rest_authorization_required_code() ) ); + return new WP_Error( 'rest_user_cannot_view', _l( 'Sorry, you are not allowed to list users.' ), array( 'status' => rest_authorization_required_code() ) ); } return true; @@ -408,7 +408,7 @@ class WP_REST_Users_Controller extends WP_REST_Controller { $current_user_id = get_current_user_id(); if ( empty( $current_user_id ) ) { - return new WP_Error( 'rest_not_logged_in', __( 'You are not currently logged in.' ), array( 'status' => 401 ) ); + return new WP_Error( 'rest_not_logged_in', _l( 'You are not currently logged in.' ), array( 'status' => 401 ) ); } $user = wp_get_current_user(); @@ -430,7 +430,7 @@ class WP_REST_Users_Controller extends WP_REST_Controller { public function create_item_permissions_check( $request ) { if ( ! current_user_can( 'create_users' ) ) { - return new WP_Error( 'rest_cannot_create_user', __( 'Sorry, you are not allowed to create new users.' ), array( 'status' => rest_authorization_required_code() ) ); + return new WP_Error( 'rest_cannot_create_user', _l( 'Sorry, you are not allowed to create new users.' ), array( 'status' => rest_authorization_required_code() ) ); } return true; @@ -446,7 +446,7 @@ class WP_REST_Users_Controller extends WP_REST_Controller { */ public function create_item( $request ) { if ( ! empty( $request['id'] ) ) { - return new WP_Error( 'rest_user_exists', __( 'Cannot create existing user.' ), array( 'status' => 400 ) ); + return new WP_Error( 'rest_user_exists', _l( 'Cannot create existing user.' ), array( 'status' => 400 ) ); } $schema = $this->get_item_schema(); @@ -465,7 +465,7 @@ class WP_REST_Users_Controller extends WP_REST_Controller { $ret = wpmu_validate_user_signup( $user->user_login, $user->user_email ); if ( is_wp_error( $ret['errors'] ) && ! empty( $ret['errors']->errors ) ) { - $error = new WP_Error( 'rest_invalid_param', __( 'Invalid user parameter(s).' ), array( 'status' => 400 ) ); + $error = new WP_Error( 'rest_invalid_param', _l( 'Invalid user parameter(s).' ), array( 'status' => 400 ) ); foreach ( $ret['errors']->errors as $code => $messages ) { foreach ( $messages as $message ) { $error->add( $code, $message ); @@ -482,7 +482,7 @@ class WP_REST_Users_Controller extends WP_REST_Controller { $user_id = wpmu_create_user( $user->user_login, $user->user_pass, $user->user_email ); if ( ! $user_id ) { - return new WP_Error( 'rest_user_create', __( 'Error creating new user.' ), array( 'status' => 500 ) ); + return new WP_Error( 'rest_user_create', _l( 'Error creating new user.' ), array( 'status' => 500 ) ); } $user->ID = $user_id; @@ -563,7 +563,7 @@ class WP_REST_Users_Controller extends WP_REST_Controller { if ( ! empty( $request['roles'] ) ) { if ( ! current_user_can( 'promote_user', $user->ID ) ) { - return new WP_Error( 'rest_cannot_edit_roles', __( 'Sorry, you are not allowed to edit roles of this user.' ), array( 'status' => rest_authorization_required_code() ) ); + return new WP_Error( 'rest_cannot_edit_roles', _l( 'Sorry, you are not allowed to edit roles of this user.' ), array( 'status' => rest_authorization_required_code() ) ); } $request_params = array_keys( $request->get_params() ); @@ -576,7 +576,7 @@ class WP_REST_Users_Controller extends WP_REST_Controller { } if ( ! current_user_can( 'edit_user', $user->ID ) ) { - return new WP_Error( 'rest_cannot_edit', __( 'Sorry, you are not allowed to edit this user.' ), array( 'status' => rest_authorization_required_code() ) ); + return new WP_Error( 'rest_cannot_edit', _l( 'Sorry, you are not allowed to edit this user.' ), array( 'status' => rest_authorization_required_code() ) ); } return true; @@ -599,19 +599,19 @@ class WP_REST_Users_Controller extends WP_REST_Controller { $id = $user->ID; if ( ! $user ) { - return new WP_Error( 'rest_user_invalid_id', __( 'Invalid user ID.' ), array( 'status' => 404 ) ); + return new WP_Error( 'rest_user_invalid_id', _l( 'Invalid user ID.' ), array( 'status' => 404 ) ); } if ( email_exists( $request['email'] ) && $request['email'] !== $user->user_email ) { - return new WP_Error( 'rest_user_invalid_email', __( 'Invalid email address.' ), array( 'status' => 400 ) ); + return new WP_Error( 'rest_user_invalid_email', _l( 'Invalid email address.' ), array( 'status' => 400 ) ); } if ( ! empty( $request['username'] ) && $request['username'] !== $user->user_login ) { - return new WP_Error( 'rest_user_invalid_argument', __( "Username isn't editable." ), array( 'status' => 400 ) ); + return new WP_Error( 'rest_user_invalid_argument', _l( "Username isn't editable." ), array( 'status' => 400 ) ); } if ( ! empty( $request['slug'] ) && $request['slug'] !== $user->user_nicename && get_user_by( 'slug', $request['slug'] ) ) { - return new WP_Error( 'rest_user_invalid_slug', __( 'Invalid slug.' ), array( 'status' => 400 ) ); + return new WP_Error( 'rest_user_invalid_slug', _l( 'Invalid slug.' ), array( 'status' => 400 ) ); } if ( ! empty( $request['roles'] ) ) { @@ -710,7 +710,7 @@ class WP_REST_Users_Controller extends WP_REST_Controller { } if ( ! current_user_can( 'delete_user', $user->ID ) ) { - return new WP_Error( 'rest_user_cannot_delete', __( 'Sorry, you are not allowed to delete this user.' ), array( 'status' => rest_authorization_required_code() ) ); + return new WP_Error( 'rest_user_cannot_delete', _l( 'Sorry, you are not allowed to delete this user.' ), array( 'status' => rest_authorization_required_code() ) ); } return true; @@ -727,7 +727,7 @@ class WP_REST_Users_Controller extends WP_REST_Controller { public function delete_item( $request ) { // We don't support delete requests in multisite. if ( is_multisite() ) { - return new WP_Error( 'rest_cannot_delete', __( 'The user cannot be deleted.' ), array( 'status' => 501 ) ); + return new WP_Error( 'rest_cannot_delete', _l( 'The user cannot be deleted.' ), array( 'status' => 501 ) ); } $user = $this->get_user( $request['id'] ); if ( is_wp_error( $user ) ) { @@ -741,12 +741,12 @@ class WP_REST_Users_Controller extends WP_REST_Controller { // We don't support trashing for users. if ( ! $force ) { /* translators: %s: force=true */ - return new WP_Error( 'rest_trash_not_supported', sprintf( __( "Users do not support trashing. Set '%s' to delete." ), 'force=true' ), array( 'status' => 501 ) ); + return new WP_Error( 'rest_trash_not_supported', sprintf( _l( "Users do not support trashing. Set '%s' to delete." ), 'force=true' ), array( 'status' => 501 ) ); } if ( ! empty( $reassign ) ) { if ( $reassign === $id || ! get_userdata( $reassign ) ) { - return new WP_Error( 'rest_user_invalid_reassign', __( 'Invalid user ID for reassignment.' ), array( 'status' => 400 ) ); + return new WP_Error( 'rest_user_invalid_reassign', _l( 'Invalid user ID for reassignment.' ), array( 'status' => 400 ) ); } } @@ -760,7 +760,7 @@ class WP_REST_Users_Controller extends WP_REST_Controller { $result = wp_delete_user( $id, $reassign ); if ( ! $result ) { - return new WP_Error( 'rest_cannot_delete', __( 'The user cannot be deleted.' ), array( 'status' => 500 ) ); + return new WP_Error( 'rest_cannot_delete', _l( 'The user cannot be deleted.' ), array( 'status' => 500 ) ); } $response = new WP_REST_Response(); @@ -1034,7 +1034,7 @@ class WP_REST_Users_Controller extends WP_REST_Controller { if ( ! isset( $wp_roles->role_objects[ $role ] ) ) { /* translators: %s: role key */ - return new WP_Error( 'rest_user_invalid_role', sprintf( __( 'The role %s does not exist.' ), $role ), array( 'status' => 400 ) ); + return new WP_Error( 'rest_user_invalid_role', sprintf( _l( 'The role %s does not exist.' ), $role ), array( 'status' => 400 ) ); } $potential_role = $wp_roles->role_objects[ $role ]; @@ -1048,7 +1048,7 @@ class WP_REST_Users_Controller extends WP_REST_Controller { && get_current_user_id() === $user_id && ! $potential_role->has_cap( 'edit_users' ) ) { - return new WP_Error( 'rest_user_invalid_role', __( 'Sorry, you are not allowed to give users that role.' ), array( 'status' => rest_authorization_required_code() ) ); + return new WP_Error( 'rest_user_invalid_role', _l( 'Sorry, you are not allowed to give users that role.' ), array( 'status' => rest_authorization_required_code() ) ); } /** Include admin functions to get access to get_editable_roles() */ @@ -1058,7 +1058,7 @@ class WP_REST_Users_Controller extends WP_REST_Controller { $editable_roles = get_editable_roles(); if ( empty( $editable_roles[ $role ] ) ) { - return new WP_Error( 'rest_user_invalid_role', __( 'Sorry, you are not allowed to give users that role.' ), array( 'status' => 403 ) ); + return new WP_Error( 'rest_user_invalid_role', _l( 'Sorry, you are not allowed to give users that role.' ), array( 'status' => 403 ) ); } } @@ -1081,14 +1081,14 @@ class WP_REST_Users_Controller extends WP_REST_Controller { $username = (string) $value; if ( ! validate_username( $username ) ) { - return new WP_Error( 'rest_user_invalid_username', __( 'Username contains invalid characters.' ), array( 'status' => 400 ) ); + return new WP_Error( 'rest_user_invalid_username', _l( 'Username contains invalid characters.' ), array( 'status' => 400 ) ); } /** This filter is documented in wp-includes/user.php */ $illegal_logins = (array) apply_filters( 'illegal_user_logins', array() ); if ( in_array( strtolower( $username ), array_map( 'strtolower', $illegal_logins ) ) ) { - return new WP_Error( 'rest_user_invalid_username', __( 'Sorry, that username is not allowed.' ), array( 'status' => 400 ) ); + return new WP_Error( 'rest_user_invalid_username', _l( 'Sorry, that username is not allowed.' ), array( 'status' => 400 ) ); } return $username; @@ -1110,11 +1110,11 @@ class WP_REST_Users_Controller extends WP_REST_Controller { $password = (string) $value; if ( empty( $password ) ) { - return new WP_Error( 'rest_user_invalid_password', __( 'Passwords cannot be empty.' ), array( 'status' => 400 ) ); + return new WP_Error( 'rest_user_invalid_password', _l( 'Passwords cannot be empty.' ), array( 'status' => 400 ) ); } if ( false !== strpos( $password, "\\" ) ) { - return new WP_Error( 'rest_user_invalid_password', __( 'Passwords cannot contain the "\\" character.' ), array( 'status' => 400 ) ); + return new WP_Error( 'rest_user_invalid_password', _l( 'Passwords cannot contain the "\\" character.' ), array( 'status' => 400 ) ); } return $password; @@ -1134,13 +1134,13 @@ class WP_REST_Users_Controller extends WP_REST_Controller { 'type' => 'object', 'properties' => array( 'id' => array( - 'description' => __( 'Unique identifier for the user.' ), + 'description' => _l( 'Unique identifier for the user.' ), 'type' => 'integer', 'context' => array( 'embed', 'view', 'edit' ), 'readonly' => true, ), 'username' => array( - 'description' => __( 'Login name for the user.' ), + 'description' => _l( 'Login name for the user.' ), 'type' => 'string', 'context' => array( 'edit' ), 'required' => true, @@ -1149,7 +1149,7 @@ class WP_REST_Users_Controller extends WP_REST_Controller { ), ), 'name' => array( - 'description' => __( 'Display name for the user.' ), + 'description' => _l( 'Display name for the user.' ), 'type' => 'string', 'context' => array( 'embed', 'view', 'edit' ), 'arg_options' => array( @@ -1157,7 +1157,7 @@ class WP_REST_Users_Controller extends WP_REST_Controller { ), ), 'first_name' => array( - 'description' => __( 'First name for the user.' ), + 'description' => _l( 'First name for the user.' ), 'type' => 'string', 'context' => array( 'edit' ), 'arg_options' => array( @@ -1165,7 +1165,7 @@ class WP_REST_Users_Controller extends WP_REST_Controller { ), ), 'last_name' => array( - 'description' => __( 'Last name for the user.' ), + 'description' => _l( 'Last name for the user.' ), 'type' => 'string', 'context' => array( 'edit' ), 'arg_options' => array( @@ -1173,38 +1173,38 @@ class WP_REST_Users_Controller extends WP_REST_Controller { ), ), 'email' => array( - 'description' => __( 'The email address for the user.' ), + 'description' => _l( 'The email address for the user.' ), 'type' => 'string', 'format' => 'email', 'context' => array( 'edit' ), 'required' => true, ), 'url' => array( - 'description' => __( 'URL of the user.' ), + 'description' => _l( 'URL of the user.' ), 'type' => 'string', 'format' => 'uri', 'context' => array( 'embed', 'view', 'edit' ), ), 'description' => array( - 'description' => __( 'Description of the user.' ), + 'description' => _l( 'Description of the user.' ), 'type' => 'string', 'context' => array( 'embed', 'view', 'edit' ), ), 'link' => array( - 'description' => __( 'Author URL of the user.' ), + 'description' => _l( 'Author URL of the user.' ), 'type' => 'string', 'format' => 'uri', 'context' => array( 'embed', 'view', 'edit' ), 'readonly' => true, ), 'locale' => array( - 'description' => __( 'Locale for the user.' ), + 'description' => _l( 'Locale for the user.' ), 'type' => 'string', 'enum' => array_merge( array( '', 'en_US' ), get_available_languages() ), 'context' => array( 'edit' ), ), 'nickname' => array( - 'description' => __( 'The nickname for the user.' ), + 'description' => _l( 'The nickname for the user.' ), 'type' => 'string', 'context' => array( 'edit' ), 'arg_options' => array( @@ -1212,7 +1212,7 @@ class WP_REST_Users_Controller extends WP_REST_Controller { ), ), 'slug' => array( - 'description' => __( 'An alphanumeric identifier for the user.' ), + 'description' => _l( 'An alphanumeric identifier for the user.' ), 'type' => 'string', 'context' => array( 'embed', 'view', 'edit' ), 'arg_options' => array( @@ -1220,14 +1220,14 @@ class WP_REST_Users_Controller extends WP_REST_Controller { ), ), 'registered_date' => array( - 'description' => __( 'Registration date for the user.' ), + 'description' => _l( 'Registration date for the user.' ), 'type' => 'string', 'format' => 'date-time', 'context' => array( 'edit' ), 'readonly' => true, ), 'roles' => array( - 'description' => __( 'Roles assigned to the user.' ), + 'description' => _l( 'Roles assigned to the user.' ), 'type' => 'array', 'items' => array( 'type' => 'string', @@ -1235,7 +1235,7 @@ class WP_REST_Users_Controller extends WP_REST_Controller { 'context' => array( 'edit' ), ), 'password' => array( - 'description' => __( 'Password for the user (never included).' ), + 'description' => _l( 'Password for the user (never included).' ), 'type' => 'string', 'context' => array(), // Password is never displayed. 'required' => true, @@ -1244,13 +1244,13 @@ class WP_REST_Users_Controller extends WP_REST_Controller { ), ), 'capabilities' => array( - 'description' => __( 'All capabilities assigned to the user.' ), + 'description' => _l( 'All capabilities assigned to the user.' ), 'type' => 'object', 'context' => array( 'edit' ), 'readonly' => true, ), 'extra_capabilities' => array( - 'description' => __( 'Any extra capabilities assigned to the user.' ), + 'description' => _l( 'Any extra capabilities assigned to the user.' ), 'type' => 'object', 'context' => array( 'edit' ), 'readonly' => true, @@ -1266,7 +1266,7 @@ class WP_REST_Users_Controller extends WP_REST_Controller { foreach ( $avatar_sizes as $size ) { $avatar_properties[ $size ] = array( /* translators: %d: avatar image size in pixels */ - 'description' => sprintf( __( 'Avatar URL with image size of %d pixels.' ), $size ), + 'description' => sprintf( _l( 'Avatar URL with image size of %d pixels.' ), $size ), 'type' => 'string', 'format' => 'uri', 'context' => array( 'embed', 'view', 'edit' ), @@ -1274,7 +1274,7 @@ class WP_REST_Users_Controller extends WP_REST_Controller { } $schema['properties']['avatar_urls'] = array( - 'description' => __( 'Avatar URLs for the user.' ), + 'description' => _l( 'Avatar URLs for the user.' ), 'type' => 'object', 'context' => array( 'embed', 'view', 'edit' ), 'readonly' => true, @@ -1300,7 +1300,7 @@ class WP_REST_Users_Controller extends WP_REST_Controller { $query_params['context']['default'] = 'view'; $query_params['exclude'] = array( - 'description' => __( 'Ensure result set excludes specific IDs.' ), + 'description' => _l( 'Ensure result set excludes specific IDs.' ), 'type' => 'array', 'items' => array( 'type' => 'integer', @@ -1309,7 +1309,7 @@ class WP_REST_Users_Controller extends WP_REST_Controller { ); $query_params['include'] = array( - 'description' => __( 'Limit result set to specific IDs.' ), + 'description' => _l( 'Limit result set to specific IDs.' ), 'type' => 'array', 'items' => array( 'type' => 'integer', @@ -1318,20 +1318,20 @@ class WP_REST_Users_Controller extends WP_REST_Controller { ); $query_params['offset'] = array( - 'description' => __( 'Offset the result set by a specific number of items.' ), + 'description' => _l( 'Offset the result set by a specific number of items.' ), 'type' => 'integer', ); $query_params['order'] = array( 'default' => 'asc', - 'description' => __( 'Order sort attribute ascending or descending.' ), + 'description' => _l( 'Order sort attribute ascending or descending.' ), 'enum' => array( 'asc', 'desc' ), 'type' => 'string', ); $query_params['orderby'] = array( 'default' => 'name', - 'description' => __( 'Sort collection by object attribute.' ), + 'description' => _l( 'Sort collection by object attribute.' ), 'enum' => array( 'id', 'include', @@ -1345,7 +1345,7 @@ class WP_REST_Users_Controller extends WP_REST_Controller { ); $query_params['slug'] = array( - 'description' => __( 'Limit result set to users with one or more specific slugs.' ), + 'description' => _l( 'Limit result set to users with one or more specific slugs.' ), 'type' => 'array', 'items' => array( 'type' => 'string', @@ -1353,7 +1353,7 @@ class WP_REST_Users_Controller extends WP_REST_Controller { ); $query_params['roles'] = array( - 'description' => __( 'Limit result set to users matching at least one specific role provided. Accepts csv list or single role.' ), + 'description' => _l( 'Limit result set to users matching at least one specific role provided. Accepts csv list or single role.' ), 'type' => 'array', 'items' => array( 'type' => 'string', diff --git src/wp-includes/rest-api/fields/class-wp-rest-meta-fields.php src/wp-includes/rest-api/fields/class-wp-rest-meta-fields.php index 9288c0a284..519fcd4850 100644 --- src/wp-includes/rest-api/fields/class-wp-rest-meta-fields.php +++ src/wp-includes/rest-api/fields/class-wp-rest-meta-fields.php @@ -173,7 +173,7 @@ abstract class WP_REST_Meta_Fields { return new WP_Error( 'rest_cannot_delete', /* translators: %s: custom field key */ - sprintf( __( 'Sorry, you are not allowed to edit the %s custom field.' ), $name ), + sprintf( _l( 'Sorry, you are not allowed to edit the %s custom field.' ), $name ), array( 'key' => $name, 'status' => rest_authorization_required_code() ) ); } @@ -181,7 +181,7 @@ abstract class WP_REST_Meta_Fields { if ( ! delete_metadata( $meta_type, $object_id, wp_slash( $meta_key ) ) ) { return new WP_Error( 'rest_meta_database_error', - __( 'Could not delete meta value from database.' ), + _l( 'Could not delete meta value from database.' ), array( 'key' => $name, 'status' => WP_Http::INTERNAL_SERVER_ERROR ) ); } @@ -208,7 +208,7 @@ abstract class WP_REST_Meta_Fields { return new WP_Error( 'rest_cannot_update', /* translators: %s: custom field key */ - sprintf( __( 'Sorry, you are not allowed to edit the %s custom field.' ), $name ), + sprintf( _l( 'Sorry, you are not allowed to edit the %s custom field.' ), $name ), array( 'key' => $name, 'status' => rest_authorization_required_code() ) ); } @@ -243,7 +243,7 @@ abstract class WP_REST_Meta_Fields { if ( ! delete_metadata( $meta_type, $object_id, wp_slash( $meta_key ), wp_slash( $value ) ) ) { return new WP_Error( 'rest_meta_database_error', - __( 'Could not update meta value in database.' ), + _l( 'Could not update meta value in database.' ), array( 'key' => $name, 'status' => WP_Http::INTERNAL_SERVER_ERROR ) ); } @@ -253,7 +253,7 @@ abstract class WP_REST_Meta_Fields { if ( ! add_metadata( $meta_type, $object_id, wp_slash( $meta_key ), wp_slash( $value ) ) ) { return new WP_Error( 'rest_meta_database_error', - __( 'Could not update meta value in database.' ), + _l( 'Could not update meta value in database.' ), array( 'key' => $name, 'status' => WP_Http::INTERNAL_SERVER_ERROR ) ); } @@ -279,7 +279,7 @@ abstract class WP_REST_Meta_Fields { return new WP_Error( 'rest_cannot_update', /* translators: %s: custom field key */ - sprintf( __( 'Sorry, you are not allowed to edit the %s custom field.' ), $name ), + sprintf( _l( 'Sorry, you are not allowed to edit the %s custom field.' ), $name ), array( 'key' => $name, 'status' => rest_authorization_required_code() ) ); } @@ -299,7 +299,7 @@ abstract class WP_REST_Meta_Fields { if ( ! update_metadata( $meta_type, $object_id, $meta_key, $meta_value ) ) { return new WP_Error( 'rest_meta_database_error', - __( 'Could not update meta value in database.' ), + _l( 'Could not update meta value in database.' ), array( 'key' => $name, 'status' => WP_Http::INTERNAL_SERVER_ERROR ) ); } @@ -376,7 +376,7 @@ abstract class WP_REST_Meta_Fields { $fields = $this->get_registered_fields(); $schema = array( - 'description' => __( 'Meta fields.' ), + 'description' => _l( 'Meta fields.' ), 'type' => 'object', 'context' => array( 'view', 'edit' ), 'properties' => array(), diff --git tests/phpunit/tests/rest-api/rest-users-controller.php tests/phpunit/tests/rest-api/rest-users-controller.php index d04cbcb7f7..e6476e14c2 100644 --- tests/phpunit/tests/rest-api/rest-users-controller.php +++ tests/phpunit/tests/rest-api/rest-users-controller.php @@ -948,7 +948,6 @@ class WP_Test_REST_Users_Controller extends WP_Test_REST_Controller_Testcase { } else { $this->assertInternalType( 'array', $data['data']['params'] ); $errors = $data['data']['params']; - $this->assertInternalType( 'string', $errors['username'] ); $this->assertEquals( 'Username contains invalid characters.', $errors['username'] ); } } @@ -988,7 +987,6 @@ class WP_Test_REST_Users_Controller extends WP_Test_REST_Controller_Testcase { $data = $response->get_data(); $this->assertInternalType( 'array', $data['data']['params'] ); $errors = $data['data']['params']; - $this->assertInternalType( 'string', $errors['username'] ); $this->assertEquals( 'Sorry, that username is not allowed.', $errors['username'] ); }