From 0aba11ac1e579d6873c3ac464954b40f8bc010cd Mon Sep 17 00:00:00 2001 From: Sergey Biryukov Date: Thu, 14 Jul 2022 13:33:12 +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. git-svn-id: https://develop.svn.wordpress.org/trunk@53699 602fd350-edb4-49c9-b593-d223f7449a82 --- src/wp-includes/ms-default-constants.php | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/wp-includes/ms-default-constants.php b/src/wp-includes/ms-default-constants.php index 016ed437b7..128b47b9ae 100644 --- a/src/wp-includes/ms-default-constants.php +++ b/src/wp-includes/ms-default-constants.php @@ -143,11 +143,21 @@ function ms_subdomain_constants() { 'wp-config.php', 'is_subdomain_install()' ); + if ( $subdomain_error_warn ) { - trigger_error( __( 'Conflicting values for the constants VHOST and SUBDOMAIN_INSTALL. 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 */ + __( 'Conflicting values for the constants %1$s and %2$s. The value of %2$s will be assumed to be your subdomain configuration setting.' ), + 'VHOST', + 'SUBDOMAIN_INSTALL' + ) . ' ' . $vhost_deprecated, + E_USER_WARNING + ); } else { _deprecated_argument( 'define()', '3.0.0', $vhost_deprecated ); } + return; }