Ticket #42655: 42655.diff

src/wp-includes/class-wp-customize-manager.php

@@ -3939 +3939 @@
          * @since 4.1.0
          */
         public function render_control_templates() {
+                if ( $this->branching() ) {
+                        /* translators: %s: User who is customizing the changeset in customizer. */
+                        $locked = __( '%s is already customizing this changeset. Please wait until they are done to try customizing. Your latest changes have been autosaved.' );
+                        /* translators: %s: User who is customizing the changeset in customizer. */
+                        $locked_allow_override = __( '%s is already customizing this changeset. Do you want to take over?' );
+                } else {
+                        /* translators: %s: User who is customizing the changeset in customizer. */
+                        $locked = __( '%s is already customizing this site. Please wait until they are done to try customizing. Your latest changes have been autosaved.' );
+                        /* translators: %s: User who is customizing the changeset in customizer. */
+                        $locked_allow_override = __( '%s is already customizing this site. Do you want to take over?' );
+                }
+
                 foreach ( $this->registered_control_types as $control_type ) {
                         $control = new $control_type( $this, 'temp', array(
                                 'settings' => array(),
@@ -4101 +4113 @@
                                                         {{{ data.message }}}
                                                 <# } else if ( data.allowOverride ) { #>
                                                         <?php
-                                                        /* translators: %s: User who is customizing the changeset in customizer. */
-                                                        printf( __( '%s is already customizing this site. Do you want to take over?' ), '{{ data.lockUser.name }}' );
+                                                        echo esc_html( sprintf( $locked_allow_override, '{{ data.lockUser.name }}' ) );
                                                         ?>
                                                 <# } else { #>
                                                         <?php
-                                                        /* translators: %s: User who is customizing the changeset in customizer. */
-                                                        printf( __( '%s is already customizing this site. Please wait until they are done to try customizing. Your latest changes have been autosaved.' ), '{{ data.lockUser.name }}' );
+                                                        echo esc_html( sprintf( $locked, '{{ data.lockUser.name }}' ) );
                                                         ?>
                                                 <# } #>
                                         </p>