From 5a59007323fcec98e733a63f8a08e6d54193b37d Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov.ru@gmail.com>
Date: Thu, 14 Jul 2022 13:35:13 +0000
Subject: [PATCH] I18N: Remove code from a translatable string in
 `wp-includes/ms-default-constants.php`.

This replaces the `VHOST` and `SUBDOMAIN_INSTALL` constant names in a message in `ms_subdomain_constants()` with placeholders, as they don't need to be translated.

Follow-up to [36773].

Props weboccults, hztyfoon, pratiweb.
Fixes #56216.
Built from https://develop.svn.wordpress.org/trunk@53699


git-svn-id: http://core.svn.wordpress.org/trunk@53258 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/ms-default-constants.php | 12 +++++++++++-
 wp-includes/version.php              |  2 +-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/wp-includes/ms-default-constants.php b/wp-includes/ms-default-constants.php
index 016ed437b7..128b47b9ae 100644
--- a/wp-includes/ms-default-constants.php
+++ b/wp-includes/ms-default-constants.php
@@ -143,11 +143,21 @@ function ms_subdomain_constants() {
 			'<code>wp-config.php</code>',
 			'<code>is_subdomain_install()</code>'
 		);
+
 		if ( $subdomain_error_warn ) {
-			trigger_error( __( '<strong>Conflicting values for the constants VHOST and SUBDOMAIN_INSTALL.</strong> The value of SUBDOMAIN_INSTALL will be assumed to be your subdomain configuration setting.' ) . ' ' . $vhost_deprecated, E_USER_WARNING );
+			trigger_error(
+				sprintf(
+					/* translators: 1: VHOST, 2: SUBDOMAIN_INSTALL */
+					__( '<strong>Conflicting values for the constants %1$s and %2$s.</strong> The value of %2$s will be assumed to be your subdomain configuration setting.' ),
+					'<code>VHOST</code>',
+					'<code>SUBDOMAIN_INSTALL</code>'
+				) . ' ' . $vhost_deprecated,
+				E_USER_WARNING
+			);
 		} else {
 			_deprecated_argument( 'define()', '3.0.0', $vhost_deprecated );
 		}
+
 		return;
 	}
 
diff --git a/wp-includes/version.php b/wp-includes/version.php
index a5ba84fba1..5363599934 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -16,7 +16,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '6.1-alpha-53698';
+$wp_version = '6.1-alpha-53699';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.