Changeset 30862

Timestamp:

12/15/2014 02:56:06 PM (12 years ago)

Author:

johnbillion

Message:

TinyMCE: add another Edit translatable string for the tooltip of the Edit button on the image toolbar.

Merges [30839] to the 4.1 branch.

Props pavelevap
Fixes #30694

Location:

branches/4.1

Files:

• . (modified) (1 prop)
• src/wp-includes/class-wp-editor.php (modified) (2 diffs)
• src/wp-includes/js/tinymce/plugins/wpeditimage/plugin.js (modified) (1 diff)

branches/4.1/src/wp-includes/class-wp-editor.php

@@ -985 +985 @@
                         'Insert' => _x( 'Insert', 'TinyMCE menu' ),
                         'File' => _x( 'File', 'TinyMCE menu' ),
-                        'Edit' => _x( 'Edit', 'TinyMCE menu and tooltip for the Edit button in the image toolbar' ),
+                        'Edit' => _x( 'Edit', 'TinyMCE menu' ),
                         'Tools' => _x( 'Tools', 'TinyMCE menu' ),
                         'View' => _x( 'View', 'TinyMCE menu' ),
@@ -999 +999 @@
                         'No alignment' => __( 'No alignment' ), // Tooltip for the 'alignnone' button in the image toolbar
                         'Remove' => __( 'Remove' ), // Tooltip for the 'remove' button in the image toolbar
+                        'Edit ' => __( 'Edit' ), // Tooltip for the 'edit' button in the image toolbar
                 );
 

branches/4.1/src/wp-includes/js/tinymce/plugins/wpeditimage/plugin.js

@@ -23 +23 @@
 
         editor.addButton( 'wp_img_edit', {
-                tooltip: 'Edit',
+                tooltip: 'Edit ', // trailing space is needed, used for context
                 icon: 'dashicon dashicons-edit',
                 onclick: function() {