From cd5cf79e54826e17f0e0776e933402f2cee4218c Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov@git.wordpress.org>
Date: Sat, 25 Nov 2023 21:17:28 +0000
Subject: [PATCH] I18N: Move code out of translatable strings in a few error
 messages.

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

Props rabmalin, Presskopp.
Fixes #59563.

git-svn-id: https://develop.svn.wordpress.org/trunk@57135 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-includes/class-wp-duotone.php    | 15 +++++++++------
 src/wp-includes/class-wp-theme-json.php | 10 +++++++++-
 2 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/src/wp-includes/class-wp-duotone.php b/src/wp-includes/class-wp-duotone.php
index 813258c10d..194b649843 100644
--- a/src/wp-includes/class-wp-duotone.php
+++ b/src/wp-includes/class-wp-duotone.php
@@ -673,9 +673,11 @@ class WP_Duotone {
 
 			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' );
 			} else {
@@ -900,9 +902,10 @@ class WP_Duotone {
 		$global_styles_presets = self::get_all_global_styles_presets();
 		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' );
 			return;
diff --git a/src/wp-includes/class-wp-theme-json.php b/src/wp-includes/class-wp-theme-json.php
index e5f174138d..9fea12a8d3 100644
--- a/src/wp-includes/class-wp-theme-json.php
+++ b/src/wp-includes/class-wp-theme-json.php
@@ -3390,7 +3390,15 @@ class WP_Theme_JSON {
 			|| ! is_numeric( $spacing_scale['mediumStep'] )
 			|| ( '+' !== $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;
 		}