Changeset 53699

Timestamp:

07/14/2022 01:33:12 PM (4 years ago)

Author:

SergeyBiryukov

Message:

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.

File:

• trunk/src/wp-includes/ms-default-constants.php (modified) (1 diff)

trunk/src/wp-includes/ms-default-constants.php

@@ -144 +144 @@
                         '<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;
         }