Ticket #31441: 31441.25.patch

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

@@ -1052 +1052 @@
                         '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.' ),
-                        '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.' ),
+                        '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 formatting shortcuts followed by a space, the formatting will be applied automatically. Press Backspace or Escape to undo.' ),
+                        'The following formatting shortcuts are replaced on pressing Enter. Press Escape or the Undo button to undo.' =>
+                                __( 'The following formatting shortcuts are replaced on pressing Enter. Press Escape or the Undo button to undo.' ),
+                        'The following formatting shortcuts are replaced on pressing Enter.' =>
+                                __( 'The following formatting shortcuts are replaced on pressing Enter.' ),
                 );
 
                 /**

src/wp-includes/js/tinymce/plugins/wordpress/plugin.js

@@ -267 +267 @@
                 if ( editor.plugins.wptextpattern ) {
                         // Text pattern section
                         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>' +
                                         tr({ '*':  'Bullet list' }) +
                                         tr({ '-':  'Bullet list' }) +
@@ -276 +276 @@
                                 '</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>' +
+                                '<h2>' + __( 'The following formatting shortcuts are replaced on pressing Enter. Press Escape or the Undo button to undo.' ) + '</h2>' +
                                 '<table>' +
                                         tr({ '>': 'Blockquote' }) +
                                         tr({ '##': 'Heading 2' }) +