diff --git a/src/wp-includes/class-wp-editor.php b/src/wp-includes/class-wp-editor.php index ef9e8576e7..6fdc8c56a2 100644 --- a/src/wp-includes/class-wp-editor.php +++ b/src/wp-includes/class-wp-editor.php @@ -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.' ), '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.' ), ); /** diff --git a/src/wp-includes/js/tinymce/plugins/wordpress/plugin.js b/src/wp-includes/js/tinymce/plugins/wordpress/plugin.js index 2c47676852..2f4bd5e11c 100644 --- a/src/wp-includes/js/tinymce/plugins/wordpress/plugin.js +++ b/src/wp-includes/js/tinymce/plugins/wordpress/plugin.js @@ -269,8 +269,15 @@ tinymce.PluginManager.add( 'wordpress', function( editor ) { html = html + '

' + __( '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.' ) + '

' + '' + - tr({ '* -': 'Bullet list' }) + - tr({ '1. 1)': 'Numbered list' }) + + tr({ '*': 'Bullet list' }) + + tr({ '-': 'Bullet list' }) + + tr({ '1.': 'Numbered list' }) + + tr({ '1)': 'Numbered list' }) + + '
'; + + html = html + + '

' + __( 'The following patterns are replaced on pressing Enter at the end of the paragraph. Press the Undo button to undo.' ) + '

' + + '' + tr({ '>': 'Blockquote' }) + tr({ '##': 'Heading 2' }) + tr({ '###': 'Heading 3' }) +