Changeset 42538

Timestamp:

01/22/2018 06:27:41 AM (9 years ago)

Author:

westonruter

Message:

Customize: Use changeset-specific "locked" messages when branching is enabled.

Props dlh.
See #39896.
Fixes #42655.

File:

• trunk/src/wp-includes/class-wp-customize-manager.php (modified) (2 diffs)

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

@@ -3987 +3987 @@
          */
         public function render_control_templates() {
+                if ( $this->branching() ) {
+                        $l10n = array(
+                                /* 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 {
+                        $l10n = array(
+                                /* 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(
@@ -4151 +4167 @@
                                                 <# } 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( $l10n['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( $l10n['locked'], '{{ data.lockUser.name }}' ) );
                                                         ?>
                                                 <# } #>