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

TinyMCE: fix (again) the text in the keyboard shortcuts modal for the changed patterns. 

See #31441.
Built from https://develop.svn.wordpress.org/trunk@33504


git-svn-id: http://core.svn.wordpress.org/trunk@33471 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Andrew Ozz 2015-07-29 21:54:24 +00:00
parent 6142cb7c94
commit c96977e083
5 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1052,10 +1052,12 @@ final class _WP_Editors {
'Action' => __( 'Action' ), 'Action' => __( 'Action' ),
'To move focus to other buttons use Tab or the arrow keys. To return focus to the editor press Escape or use one of the buttons.' => 'To move focus to other buttons use Tab or the arrow keys. To return focus to the editor press Escape or use one of the buttons.' =>
__( 'To move focus to other buttons use Tab or the arrow keys. To return focus to the editor press Escape or use one of the buttons.' ), __( 'To move focus to other buttons use Tab or the arrow keys. To return focus to the editor press Escape or use one of the buttons.' ),
'When starting a new paragraph with one of these patterns followed by a space, the formatting will be applied automatically. Press Backspace or Escape to undo.' => 'When starting a new paragraph with one of these formatting shortcuts followed by a space, the formatting will be applied automatically. Press Backspace or Escape to undo.' =>
__( 'When starting a new paragraph with one of these patterns followed by a space, the formatting will be applied automatically. Press Backspace or Escape to undo.' ), __( 'When starting a new paragraph with one of these formatting shortcuts followed by a space, the formatting will be applied automatically. Press Backspace or Escape to undo.' ),
'The following patterns are replaced on pressing Enter at the end of the paragraph. Press the Undo button to undo.' => 'The following formatting shortcuts are replaced when pressing Enter. Press Escape or the Undo button to undo.' =>
__( 'The following patterns are replaced on pressing Enter at the end of the paragraph. Press the Undo button to undo.' ), __( 'The following formatting shortcuts are replaced when pressing Enter. Press Escape or the Undo button to undo.' ),
'The following formatting shortcuts are replaced when pressing Enter.' =>
__( 'The following formatting shortcuts are replaced when pressing Enter.' ),
); );
/** /**

4
wp-includes/js/tinymce/plugins/wordpress/plugin.js
View File

@ -267,7 +267,7 @@ tinymce.PluginManager.add( 'wordpress', function( editor ) {
if ( editor.plugins.wptextpattern ) { if ( editor.plugins.wptextpattern ) {
// Text pattern section // Text pattern section
html = html + html = html +
'<h2>' + __( 'When starting a new paragraph with one of these patterns followed by a space, the formatting will be applied automatically. Press Backspace or Escape to undo.' ) + '</h2>' + '<h2>' + __( 'When starting a new paragraph with one of these formatting shortcuts followed by a space, the formatting will be applied automatically. Press Backspace or Escape to undo.' ) + '</h2>' +
'<table>' + '<table>' +
tr({ '*': 'Bullet list' }) + tr({ '*': 'Bullet list' }) +
tr({ '-': 'Bullet list' }) + tr({ '-': 'Bullet list' }) +
@ -276,7 +276,7 @@ tinymce.PluginManager.add( 'wordpress', function( editor ) {
'</table>'; '</table>';
html = html + html = html +
'<h2>' + __( 'The following patterns are replaced on pressing Enter at the end of the paragraph. Press the Undo button to undo.' ) + '</h2>' + '<h2>' + __( 'The following formatting shortcuts are replaced when pressing Enter. Press Escape or the Undo button to undo.' ) + '</h2>' +
'<table>' + '<table>' +
tr({ '>': 'Blockquote' }) + tr({ '>': 'Blockquote' }) +
tr({ '##': 'Heading 2' }) + tr({ '##': 'Heading 2' }) +

2
wp-includes/js/tinymce/plugins/wordpress/plugin.min.js vendored
View File

File diff suppressed because one or more lines are too long

BIN
wp-includes/js/tinymce/wp-tinymce.js.gz
View File

Binary file not shown.

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '4.3-beta4-33503'; $wp_version = '4.3-beta4-33504';
/** /**
* 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.