Changeset 33501

Timestamp:

07/29/2015 09:06:13 PM (8 years ago)

Author:

azaozz

Message:

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

Location:

trunk/src/wp-includes

Files:

• class-wp-editor.php (modified) (1 diff)
• js/tinymce/plugins/wordpress/plugin.js (modified) (1 diff)

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

@@ -1055 +1055 @@
             '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.' ),
         );
 

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

@@ -270 +270 @@
                 '<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>' +
-                    tr({ '*</kbd>&nbsp;<kbd>-':  'Bullet list' }) +
-                    tr({ '1.</kbd>&nbsp;<kbd>1)':  'Numbered list' }) +
+                    tr({ '*':  'Bullet 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({ '##': 'Heading 2' }) +