WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

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

Built from https://develop.svn.wordpress.org/branches/4.9@42539


git-svn-id: http://core.svn.wordpress.org/branches/4.9@42368 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Weston Ruter 2018-01-22 06:32:41 +00:00
parent 3ed6b9efd4
commit 54d1631126
2 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
wp-includes/class-wp-customize-manager.php
View File

@ -3939,6 +3939,22 @@ final class WP_Customize_Manager {
* @since 4.1.0 * @since 4.1.0
*/ */
public function render_control_templates() { 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 ) { foreach ( $this->registered_control_types as $control_type ) {
$control = new $control_type( $this, 'temp', array( $control = new $control_type( $this, 'temp', array(
'settings' => array(), 'settings' => array(),
@ -4101,13 +4117,11 @@ final class WP_Customize_Manager {
{{{ data.message }}} {{{ data.message }}}
<# } else if ( data.allowOverride ) { #> <# } else if ( data.allowOverride ) { #>
<?php <?php
/* translators: %s: User who is customizing the changeset in customizer. */ echo esc_html( sprintf( $l10n['locked_allow_override'], '{{ data.lockUser.name }}' ) );
printf( __( '%s is already customizing this site. Do you want to take over?' ), '{{ data.lockUser.name }}' );
?> ?>
<# } else { #> <# } else { #>
<?php <?php
/* translators: %s: User who is customizing the changeset in customizer. */ echo esc_html( sprintf( $l10n['locked'], '{{ data.lockUser.name }}' ) );
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 }}' );
?> ?>
<# } #> <# } #>
</p> </p>

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '4.9.3-alpha-42537'; $wp_version = '4.9.3-alpha-42539';
/** /**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.