Changeset 33504

Timestamp:

07/29/2015 09:53:22 PM (10 years ago)

Author:

azaozz

Message:

TinyMCE: fix (again) 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) (2 diffs)

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

@@ -1053 +1053 @@
             '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 when pressing Enter. Press Escape or 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.' ),
         );
 

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

@@ -268 +268 @@
             // 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' }) +
@@ -277 +277 @@
 
             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>' +
                     tr({ '>': 'Blockquote' }) +