From 362bb806cd6edec8ed3d6c248d37d40b588da34b Mon Sep 17 00:00:00 2001 From: Andrew Ozz Date: Wed, 29 Jul 2015 21:53:22 +0000 Subject: [PATCH] TinyMCE: fix (again) the text in the keyboard shortcuts modal for the changed patterns. See #31441. git-svn-id: https://develop.svn.wordpress.org/trunk@33504 602fd350-edb4-49c9-b593-d223f7449a82 --- src/wp-includes/class-wp-editor.php | 10 ++++++---- src/wp-includes/js/tinymce/plugins/wordpress/plugin.js | 4 ++-- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/wp-includes/class-wp-editor.php b/src/wp-includes/class-wp-editor.php index 6fdc8c56a2..2a4b6797d7 100644 --- a/src/wp-includes/class-wp-editor.php +++ b/src/wp-includes/class-wp-editor.php @@ -1052,10 +1052,12 @@ final class _WP_Editors { '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 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.' ), ); /** diff --git a/src/wp-includes/js/tinymce/plugins/wordpress/plugin.js b/src/wp-includes/js/tinymce/plugins/wordpress/plugin.js index 2f4bd5e11c..463fff6942 100644 --- a/src/wp-includes/js/tinymce/plugins/wordpress/plugin.js +++ b/src/wp-includes/js/tinymce/plugins/wordpress/plugin.js @@ -267,7 +267,7 @@ tinymce.PluginManager.add( 'wordpress', function( editor ) { if ( editor.plugins.wptextpattern ) { // Text pattern section 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.' ) + '

' + + '

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

' + '' + tr({ '*': 'Bullet list' }) + tr({ '-': 'Bullet list' }) + @@ -276,7 +276,7 @@ tinymce.PluginManager.add( 'wordpress', function( editor ) { '
'; html = html + - '

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

' + + '

' + __( 'The following formatting shortcuts are replaced when pressing Enter. Press Escape or the Undo button to undo.' ) + '

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