From c57efab4f43d78226a9138afc50a8fd5be535ac0 Mon Sep 17 00:00:00 2001 From: Sergey Biryukov Date: Wed, 16 Sep 2015 11:58:41 +0000 Subject: [PATCH] Add a comment to strings where the ellipsis cannot be used due to `json_encode()`, placeholders, or external dependencies. Fixes #32875. git-svn-id: https://develop.svn.wordpress.org/trunk@34233 602fd350-edb4-49c9-b593-d223f7449a82 --- src/wp-includes/class-wp-customize-manager.php | 2 +- src/wp-includes/class-wp-editor.php | 4 ++-- src/wp-includes/script-loader.php | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/wp-includes/class-wp-customize-manager.php b/src/wp-includes/class-wp-customize-manager.php index 8742c3435c..0234b176f7 100644 --- a/src/wp-includes/class-wp-customize-manager.php +++ b/src/wp-includes/class-wp-customize-manager.php @@ -627,7 +627,7 @@ final class WP_Customize_Manager { 'activeSections' => array(), 'activeControls' => array(), 'l10n' => array( - 'loading' => __( 'Loading...' ), + 'loading' => __( 'Loading...' ), // no ellipsis ), ); diff --git a/src/wp-includes/class-wp-editor.php b/src/wp-includes/class-wp-editor.php index e83eb1aad5..a7dc31b68e 100644 --- a/src/wp-includes/class-wp-editor.php +++ b/src/wp-includes/class-wp-editor.php @@ -926,7 +926,7 @@ final class _WP_Editors { 'Color' => __( 'Color' ), 'Custom color' => __( 'Custom color' ), - 'Custom...' => _x( 'Custom...', 'label for custom color' ), + 'Custom...' => _x( 'Custom...', 'label for custom color' ), // no ellipsis '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...' => __( 'Read more...' ), // Title on the placeholder inside the editor + 'Read more...' => __( 'Read more...' ), // Title on the placeholder inside the editor (no ellipsis) '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 diff --git a/src/wp-includes/script-loader.php b/src/wp-includes/script-loader.php index e3ee0ce1b0..a3a1a5690e 100644 --- a/src/wp-includes/script-loader.php +++ b/src/wp-includes/script-loader.php @@ -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...' ), + 'updating' => __( 'Updating...' ), // no ellipsis 'updated' => __( 'Updated!' ), /* translators: Error string for a failed update */ 'updateFailed' => __( 'Update Failed: %s' ), /* translators: Plugin name and version */ - 'updatingLabel' => __( 'Updating %s...' ), + 'updatingLabel' => __( 'Updating %s...' ), // no ellipsis /* translators: Plugin name and version */ 'updatedLabel' => __( '%s updated!' ), /* translators: Plugin name and version */ 'updateFailedLabel' => __( '%s update failed' ), /* translators: JavaScript accessible string */ - 'updatingMsg' => __( 'Updating... please wait.' ), + 'updatingMsg' => __( 'Updating... please wait.' ), // no ellipsis /* 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...' ), + 'saving' => __( 'Saving...' ), // no ellipsis 'error' => __( 'Could not set that as the thumbnail image. Try a different attachment.' ), 'done' => __( 'Done' ) ) );