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

Revert [34013] and parts of [33970]. 

* `_WP_Editors::wp_mce_translation()` can't be changed without changing strings in TinyMCE and plugins.
* `\u2026` is escaped by `json_encode()` to `\\u2026`, makes `\u2026` visible in our UI.

See #32875.
Built from https://develop.svn.wordpress.org/trunk@34087


git-svn-id: http://core.svn.wordpress.org/trunk@34055 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Dominik Schilling 2015-09-12 20:03:24 +00:00
parent 720cea8cf9
commit 4d5cd90b46
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -627,7 +627,7 @@ final class WP_Customize_Manager {
'activeSections' => array(),
'activeControls' => array(),
'l10n' => array(
'loading' => __( 'Loading\u2026' ),
'loading' => __( 'Loading...' ),
),
);

4
wp-includes/class-wp-editor.php
View File

@ -926,7 +926,7 @@ final class _WP_Editors {
'Color' => __( 'Color' ),
'Custom color' => __( 'Custom color' ),
'Custom\u2026' => _x( 'Custom\u2026', 'label for custom color' ),
'Custom...' => _x( 'Custom...', 'label for custom color' ),
'No color' => __( 'No color' ),
// Spelling, search/replace plugins
@ -1028,7 +1028,7 @@ final class _WP_Editors {
'Toolbar Toggle' => __( 'Toolbar Toggle' ),
'Insert Read More tag' => __( 'Insert Read More tag' ),
'Insert Page Break tag' => __( 'Insert Page Break tag' ),
'Read more\u2026' => __( 'Read more\u2026' ), // Title on the placeholder inside the editor
'Read more...' => __( 'Read more...' ), // Title on the placeholder inside the editor
'Distraction-free writing mode' => __( 'Distraction-free writing mode' ),
'No alignment' => __( 'No alignment' ), // Tooltip for the 'alignnone' button in the image toolbar
'Remove' => __( 'Remove' ), // Tooltip for the 'remove' button in the image toolbar

8
wp-includes/script-loader.php
View File

@ -564,18 +564,18 @@ function wp_default_scripts( &$scripts ) {
did_action( 'init' ) && $scripts->localize( 'updates', '_wpUpdatesSettings', array(
'ajax_nonce' => wp_create_nonce( 'updates' ),
'l10n' => array(
'updating' => __( 'Updating\u2026' ),
'updating' => __( 'Updating...' ),
'updated' => __( 'Updated!' ),
/* translators: Error string for a failed update */
'updateFailed' => __( 'Update Failed: %s' ),
/* translators: Plugin name and version */
'updatingLabel' => __( 'Updating %s\u2026' ),
'updatingLabel' => __( 'Updating %s...' ),
/* translators: Plugin name and version */
'updatedLabel' => __( '%s updated!' ),
/* translators: Plugin name and version */
'updateFailedLabel' => __( '%s update failed' ),
/* translators: JavaScript accessible string */
'updatingMsg' => __( 'Updating\u2026 please wait.' ),
'updatingMsg' => __( 'Updating... please wait.' ),
/* translators: JavaScript accessible string */
'updatedMsg' => __( 'Update completed successfully.' ),
/* translators: JavaScript accessible string */
@ -613,7 +613,7 @@ function wp_default_scripts( &$scripts ) {
$scripts->add( 'set-post-thumbnail', "/wp-admin/js/set-post-thumbnail$suffix.js", array( 'jquery' ), false, 1 );
did_action( 'init' ) && $scripts->localize( 'set-post-thumbnail', 'setPostThumbnailL10n', array(
'setThumbnail' => __( 'Use as featured image' ),
'saving' => __( 'Saving\u2026' ),
'saving' => __( 'Saving...' ),
'error' => __( 'Could not set that as the thumbnail image. Try a different attachment.' ),
'done' => __( 'Done' )
) );

2
wp-includes/version.php
View File

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