Changeset 57135

Timestamp:

11/25/2023 09:17:28 PM (3 years ago)

Author:

SergeyBiryukov

Message:

I18N: Move code out of translatable strings in a few error messages.

Follow-up to [54272], [56101].

Props rabmalin, Presskopp.
Fixes #59563.

Location:

trunk/src/wp-includes

Files:

• class-wp-duotone.php (modified) (2 diffs)
• class-wp-theme-json.php (modified) (1 diff)

trunk/src/wp-includes/class-wp-duotone.php

@@ -674 +674 @@
                         if ( null === $color ) {
                                 $error_message = sprintf(
-                                        /* translators: %s: duotone colors */
-                                        __( '"%s" in theme.json settings.color.duotone is not a hex or rgb string.' ),
-                                        $color_str
+                                        /* translators: 1: Duotone colors, 2: theme.json, 3: settings.color.duotone */
+                                        __( '"%1$s" in %2$s %3$s is not a hex or rgb string.' ),
+                                        $color_str,
+                                        'theme.json',
+                                        'settings.color.duotone'
                                 );
                                 _doing_it_wrong( __METHOD__, $error_message, '6.3.0' );
@@ -901 +903 @@
                 if ( ! array_key_exists( $filter_id, $global_styles_presets ) ) {
                         $error_message = sprintf(
-                                /* translators: %s: duotone filter ID */
-                                __( 'The duotone id "%s" is not registered in theme.json settings' ),
-                                $filter_id
+                                /* translators: 1: Duotone filter ID, 2: theme.json */
+                                __( 'The duotone id "%1$s" is not registered in %2$s settings' ),
+                                $filter_id,
+                                'theme.json'
                         );
                         _doing_it_wrong( __METHOD__, $error_message, '6.3.0' );

trunk/src/wp-includes/class-wp-theme-json.php

@@ -3391 +3391 @@
                         || ( '+' !== $spacing_scale['operator'] && '*' !== $spacing_scale['operator'] ) ) {
                         if ( ! empty( $spacing_scale ) ) {
-                                trigger_error( __( 'Some of the theme.json settings.spacing.spacingScale values are invalid' ), E_USER_NOTICE );
+                                trigger_error(
+                                        sprintf(
+                                                /* translators: 1: theme.json, 2: settings.spacing.spacingScale */
+                                                __( 'Some of the %1$s %2$s values are invalid' ),
+                                                'theme.json',
+                                                'settings.spacing.spacingScale'
+                                        ),
+                                        E_USER_NOTICE
+                                );
                         }
                         return null;