Ticket #31832: 31832.patch

src/wp-admin/edit-form-advanced.php

@@ -397 +397 @@
         ) );
 }
 
+if ( 'post' == $post_type || 'page' == $post_type ) {
+        $using_emoji = '<p>' . __( 'Emoji bring your content alive with smilies and icons. On your mobile device you can access emoji straight from your keyboard, but on desktop you need to take a few extra steps.' ) . '</p>';
+        $using_emoji .= '<p>' . __( '<ul><li><strong>Mac OSX</strong> - use the keyboard shortcut Ctrl+Cmd+Space to bring up the emoji panel.</li><li><strong>Linux</strong> - refer to the documentation for your distribution.</li><li><strong>Windows</strong> - access the touch keyboard.</li> </ul>Please refer to the Codex to <a href="http://codex.wordpress.org/Emoji">learn more about emoji</a>.' ) . '</p>';
+
+        get_current_screen()->add_help_tab( array(
+                'id'            => 'using-emoji',
+                'title'         => __( 'Using Emoji' ),
+                'content'       => $using_emoji,
+        ) );
+}
+
 require_once( ABSPATH . 'wp-admin/admin-header.php' );
 ?>
 

src/wp-includes/js/tinymce/wp-mce-help.php

@@ -92 +92 @@
 <div class="wrap">
 
 <div>
-        <p><?php _e('Rather than reaching for your mouse to click on the toolbar, use these access keys. Windows and Linux use Ctrl + letter. Macintosh uses Command + letter.'); ?></p>
+        <p><?php _e('Speed up your workflow by using these shortcuts. Windows and Linux use Ctrl + letter. Mac uses Cmd + letter.'); ?></p>
 
         <table class="keys">
                 <tr class="top"><th class="key center"><?php _e('Letter'); ?></th><th class="left"><?php _e('Action'); ?></th><th class="key center"><?php _e('Letter'); ?></th><th class="left"><?php _e('Action'); ?></th></tr>
@@ -119 +119 @@
                 <tr><th>p</th><td><?php _e('Insert Page Break tag'); ?></td><th>h</th><td><?php _e('Help'); ?></td></tr>
                 <tr><th>x</th><td><?php _e('Add/remove code tag'); ?></td><th> </th><td>&nbsp;</td></tr>
         </table>
+        
+        <p><?php _e('To access the emoji panel:'); ?></p>
 
+        <table class="keys focus">
+                <tr><th class="left">Windows</th><td><?php _e('Open the touch keyboard (<a href="http://codex.wordpress.org/Emoji" target="_blank">learn more</a>)'); ?></td></tr>
+                <tr><th class="left">Mac OSX</th><td><?php _e('Cmd+Ctrl+Space'); ?></td></tr>
+        </table>
+
         <p><?php _e('Focus shortcuts:'); ?></p>
 
         <table class="keys focus">