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

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

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


git-svn-id: http://core.svn.wordpress.org/trunk@33468 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Andrew Ozz 2015-07-29 21:07:23 +00:00
parent 5720007f67
commit c9871174d1
5 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1054,6 +1054,8 @@ final class _WP_Editors {
__( '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 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 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 patterns 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 patterns are replaced on pressing Enter at the end of the paragraph. Press the Undo button to undo.' ),
); );
/** /**

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

@ -269,8 +269,15 @@ tinymce.PluginManager.add( 'wordpress', function( editor ) {
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 patterns followed by a space, the formatting will be applied automatically. Press Backspace or Escape to undo.' ) + '</h2>' +
'<table>' + '<table>' +
tr({ '*</kbd>&nbsp;<kbd>-': 'Bullet list' }) + tr({ '*': 'Bullet list' }) +
tr({ '1.</kbd>&nbsp;<kbd>1)': 'Numbered list' }) + tr({ '-': 'Bullet list' }) +
tr({ '1.': 'Numbered list' }) +
tr({ '1)': 'Numbered list' }) +
'</table>';
html = html +
'<h2>' + __( 'The following patterns are replaced on pressing Enter at the end of the paragraph. Press the Undo button to undo.' ) + '</h2>' +
'<table>' +
tr({ '>': 'Blockquote' }) + tr({ '>': 'Blockquote' }) +
tr({ '##': 'Heading 2' }) + tr({ '##': 'Heading 2' }) +
tr({ '###': 'Heading 3' }) + tr({ '###': 'Heading 3' }) +

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-33500'; $wp_version = '4.3-beta4-33501';
/** /**
* 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.