From 2dbcd8933e5d05130e2edc8b8ae7f22e685c2cd8 Mon Sep 17 00:00:00 2001 From: gziolo Date: Tue, 19 Jan 2021 11:06:14 +0000 Subject: [PATCH] Blocks: Add i18n support to register_block_type_from_metadata Related Gutenberg issue: https://github.com/WordPress/gutenberg/issues/23636. Related WP-CLI PR: https://github.com/wp-cli/i18n-command/pull/210. Related documentation proposal: https://github.com/WordPress/gutenberg/blob/master/docs/designers-developers/developers/block-api/block-metadata.md#internationalization-not-implemented Adds programatic i18n support to `register_block_type_from_metadata` function for block settings registered from `block.json` file that provides `textdomain` field. Props swissspidy, ocean90. Fixes #52301. Built from https://develop.svn.wordpress.org/trunk@49981 git-svn-id: http://core.svn.wordpress.org/trunk@49682 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/blocks.php | 53 +++++++++++++++++++++++++++++++++++++++-- wp-includes/version.php | 2 +- 2 files changed, 52 insertions(+), 3 deletions(-) diff --git a/wp-includes/blocks.php b/wp-includes/blocks.php index 1b5427340f..ace9811f32 100644 --- a/wp-includes/blocks.php +++ b/wp-includes/blocks.php @@ -134,7 +134,15 @@ function register_block_script_handle( $metadata, $field_name ) { $script_asset['dependencies'], $script_asset['version'] ); - return $result ? $script_handle : false; + if ( ! $result ) { + return false; + } + + if ( ! empty( $metadata['textdomain'] ) ) { + wp_set_script_translations( $script_handle, $metadata['textdomain'] ); + } + + return $script_handle; } /** @@ -229,7 +237,48 @@ function register_block_type_from_metadata( $file_or_folder, $args = array() ) { foreach ( $property_mappings as $key => $mapped_key ) { if ( isset( $metadata[ $key ] ) ) { - $settings[ $mapped_key ] = $metadata[ $key ]; + $value = $metadata[ $key ]; + if ( empty( $metadata['textdomain'] ) ) { + $settings[ $mapped_key ] = $value; + continue; + } + $textdomain = $metadata['textdomain']; + switch ( $key ) { + case 'title': + case 'description': + // phpcs:ignore WordPress.WP.I18n.LowLevelTranslationFunction,WordPress.WP.I18n.NonSingularStringLiteralText,WordPress.WP.I18n.NonSingularStringLiteralContext,WordPress.WP.I18n.NonSingularStringLiteralDomain + $settings[ $mapped_key ] = translate_with_gettext_context( $value, sprintf( 'block %s', $key ), $textdomain ); + break; + case 'keywords': + $settings[ $mapped_key ] = array(); + if ( ! is_array( $value ) ) { + continue 2; + } + + foreach ( $value as $keyword ) { + // phpcs:ignore WordPress.WP.I18n.LowLevelTranslationFunction,WordPress.WP.I18n.NonSingularStringLiteralText,WordPress.WP.I18n.NonSingularStringLiteralDomain + $settings[ $mapped_key ][] = translate_with_gettext_context( $keyword, 'block keyword', $textdomain ); + } + + break; + case 'styles': + $settings[ $mapped_key ] = array(); + if ( ! is_array( $value ) ) { + continue 2; + } + + foreach ( $value as $style ) { + if ( ! empty( $style['label'] ) ) { + // phpcs:ignore WordPress.WP.I18n.LowLevelTranslationFunction,WordPress.WP.I18n.NonSingularStringLiteralText,WordPress.WP.I18n.NonSingularStringLiteralDomain + $style['label'] = translate_with_gettext_context( $style['label'], 'block style label', $textdomain ); + } + $settings[ $mapped_key ][] = $style; + } + + break; + default: + $settings[ $mapped_key ] = $value; + } } } diff --git a/wp-includes/version.php b/wp-includes/version.php index 238184e497..aa4ec57ead 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -13,7 +13,7 @@ * * @global string $wp_version */ -$wp_version = '5.7-alpha-49980'; +$wp_version = '5.7-alpha-49981'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.