Changeset 51153 for trunk/src/wp-includes/blocks.php

Timestamp:

06/15/2021 02:01:57 PM (3 years ago)

Author:

SergeyBiryukov

Message:

Editor, I18N: Remove code from a translatable string in wp_migrate_old_typography_shape().

Replace a trigger_error() call with _doing_it_wrong() for consistency with how similar messages are displayed elsewhere in core.

Follow-up to [51089].

See #52991.

File:

• trunk/src/wp-includes/blocks.php (modified) (2 diffs)

trunk/src/wp-includes/blocks.php

@@ -85 +85 @@
     );
     if ( ! file_exists( $script_asset_path ) ) {
-        $message = sprintf(
-            /* translators: %1: field name. %2: block name */
-            __( 'The asset file for the "%1$s" defined in "%2$s" block definition is missing.', 'default' ),
-            $field_name,
-            $metadata['name']
+        _doing_it_wrong(
+            __FUNCTION__,
+            sprintf(
+                /* translators: 1: Field name, 2: Block name. */
+                __( 'The asset file for the "%1$s" defined in "%2$s" block definition is missing.', 'default' ),
+                $field_name,
+                $metadata['name']
+            ),
+            '5.5.0'
         );
-        _doing_it_wrong( __FUNCTION__, $message, '5.5.0' );
         return false;
     }
@@ -987 +990 @@
         $support_for_key = _wp_array_get( $metadata['supports'], array( $typography_key ), null );
         if ( null !== $support_for_key ) {
-            trigger_error(
-                /* translators: %1$s: Block type, %2$s: typography supports key e.g: fontSize, lineHeight etc... */
-                sprintf( __( 'Block %1$s is declaring %2$s support on block.json under supports.%2$s. %2$s support is now declared under supports.typography.%2$s.' ), $metadata['name'], $typography_key ),
-                headers_sent() || WP_DEBUG ? E_USER_WARNING : E_USER_NOTICE
+            _doing_it_wrong(
+                'register_block_type_from_metadata()',
+                sprintf(
+                    /* translators: 1: Block type, 2: Typography supports key, e.g: fontSize, lineHeight, etc. 3: block.json, 4: Old metadata key, 5: New metadata key. */
+                    __( 'Block "%1$s" is declaring %2$s support in %3$s file under %4$s. %2$s support is now declared under %5$s.' ),
+                    $metadata['name'],
+                    "<code>$typography_key</code>",
+                    '<code>block.json</code>',
+                    "<code>supports.$typography_key</code>",
+                    "<code>supports.typography.$typography_key</code>"
+                ),
+                '5.8.0'
             );
             _wp_array_set( $metadata['supports'], array( 'typography', $typography_key ), $support_for_key );