Changeset 42539 for branches/4.9/src/wp-includes/class-wp-customize-manager.php

Timestamp:

01/22/2018 06:31:39 AM (8 years ago)

Author:

westonruter

Message:

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

Props dlh.
See #39896.
Fixes #42655 for 4.9 branch.

Location:

branches/4.9

Files:

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

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

@@ -3940 +3940 @@
      */
     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( $this, 'temp', array(
@@ -4102 +4118 @@
                         <# } 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 }}' ) );
                             ?>
                         <# } #>