Call it 'Distraction-free writing mode' and update the help string.

Merges [30890] to the 4.1 branch.

Fixes #30657.

Built from https://develop.svn.wordpress.org/branches/4.1@30892


git-svn-id: http://core.svn.wordpress.org/branches/4.1@30882 1a063a9b-81f0-0310-95a4-ce76da25c4cd

wp-admin/css/l10n-rtl.css

@@ -44,7 +44,7 @@ body.locale-he-il .press-this a.wp-switch-editor {
 /* zn_CH: Enlarge font size, set font-size: normal */
 .locale-zh-cn form.upgrade .hint { font-style: normal; font-size: 100%; }
 
-/* Zn_CH: Distraction free writing.
+/* Zn_CH: Distraction-free writing.
  *  More beautiful font for "Just write."
  *  Larger text for HTML/Visual mode.
  */

wp-admin/css/l10n.css

@@ -44,7 +44,7 @@ body.locale-he-il .press-this a.wp-switch-editor {
 /* zn_CH: Enlarge font size, set font-size: normal */
 .locale-zh-cn form.upgrade .hint { font-style: normal; font-size: 100%; }
 
-/* Zn_CH: Distraction free writing.
+/* Zn_CH: Distraction-free writing.
  *  More beautiful font for "Just write."
  *  Larger text for HTML/Visual mode.
  */

wp-admin/edit-form-advanced.php

@@ -285,7 +285,7 @@ if ( 'post' == $post_type ) {
 	$title_and_editor .= '<p>' . __( 'Visual mode gives you a WYSIWYG editor. Click the last icon in the row to get a second row of controls. ') . '</p>';
 	$title_and_editor .= '<p>' . __( 'The Text mode allows you to enter HTML along with your post text. Line breaks will be converted to paragraphs automatically.' ) . '</p>';
 	$title_and_editor .= '<p>' . __( 'You can insert media files by clicking the icons above the post editor and following the directions. You can align or edit images using the inline formatting toolbar available in Visual mode.' ) . '</p>';
-	$title_and_editor .= '<p>' . __( 'You can enable distraction-free writing via the Fullscreen icon (last in the top row). This feature is not available for old browsers or devices with small screens, and requires that Editor Expand be enabled in Screen Options.' ) . '</p>';
+	$title_and_editor .= '<p>' . __( 'You can enable distraction-free writing mode using the icon to the right. This feature is not available for old browsers or devices with small screens, and requires that the full-height editor be enabled in Screen Options.' ) . '</p>';
 	$title_and_editor .= '<p>' . __( 'Keyboard users: When you&#8217;re working in the visual editor, you can use <kbd>Alt + F10</kbd> to access the toolbar.' ) . '</p>';
 
 	get_current_screen()->add_help_tab( array(

wp-admin/includes/template.php

@@ -2055,7 +2055,7 @@ final class WP_Internal_Pointers {
 			return;
 		}
 
-		$content  = '<h3>' . __( 'Distraction Free Writing' ) . '</h3>';
+		$content  = '<h3>' . __( 'Distraction-Free Writing' ) . '</h3>';
 		$content .= '<p>' . __( 'Enable distraction-free writing mode, and everything surrounding the editor will fade away when you start typing. Move your mouse out of the editor to reveal everything again.' ) . '</p>';
 
 		if ( is_rtl() ) {

wp-admin/js/editor-expand.js

@@ -1129,7 +1129,7 @@
 						button.active( false );
 					} );
 				},
-				tooltip: 'Distraction Free Writing',
+				tooltip: 'Distraction-free writing mode',
 				shortcut: 'Alt+Shift+W'
 			} );
 

wp-admin/js/wp-fullscreen.js

@@ -1,6 +1,6 @@
 /* global deleteUserSetting, setUserSetting, switchEditors, tinymce, tinyMCEPreInit */
 /**
- * Distraction Free Writing
+ * Distraction-Free Writing
  * (wp-fullscreen)
  *
  * Access the API globally using the window.wp.editor.fullscreen variable.

wp-includes/class-wp-editor.php

@@ -995,7 +995,7 @@ final class _WP_Editors {
 			'Toolbar Toggle' => __( 'Toolbar Toggle' ),
 			'Insert Read More tag' => __( 'Insert Read More tag' ),
 			'Read more...' => __( 'Read more...' ), // Title on the placeholder inside the editor
-			'Distraction Free Writing' => __( 'Distraction Free Writing' ),
+			'Distraction-free writing mode' => __( 'Distraction-free writing mode' ),
 			'No alignment' => __( 'No alignment' ), // Tooltip for the 'alignnone' button in the image toolbar
 			'Remove' => __( 'Remove' ), // Tooltip for the 'remove' button in the image toolbar
 			'Edit ' => __( 'Edit' ), // Tooltip for the 'edit' button in the image toolbar
@@ -1285,7 +1285,7 @@ final class _WP_Editors {
 
 		/**
 		 * Filter the list of TinyMCE buttons for the fullscreen
-		 * 'Distraction Free Writing' editor.
+		 * 'Distraction-Free Writing' editor.
 		 *
 		 * @since 3.2.0
 		 *

wp-includes/css/editor-rtl.css

@@ -1681,7 +1681,7 @@ i.mce-i-hr:before {
 	color: #2ea2cc;
 }
 */
-/* Distraction Free Writing mode
+/* Distraction-Free Writing mode
  * =Overlay Styles
 -------------------------------------------------------------- */
 .fullscreen-overlay {

wp-includes/css/editor.css

@@ -1681,7 +1681,7 @@ i.mce-i-hr:before {
 	color: #2ea2cc;
 }
 */
-/* Distraction Free Writing mode
+/* Distraction-Free Writing mode
  * =Overlay Styles
 -------------------------------------------------------------- */
 .fullscreen-overlay {

wp-includes/js/tinymce/langs/wp-langs-en.js

@@ -478,7 +478,7 @@
 		add_audio: "Add Audio",
 		editgallery: "Edit Gallery",
 		delgallery: "Delete Gallery",
-		wp_fullscreen_desc: "Distraction Free Writing mode (Alt + Shift + W)"
+		wp_fullscreen_desc: "Distraction-free writing mode (Alt + Shift + W)"
 	});
 
 	tinyMCE.addI18n( lang + ".wpeditimage", {

wp-includes/js/tinymce/plugins/wpfullscreen/plugin.js

@@ -1,6 +1,6 @@
 /* global tinymce */
 /**
- * WP Fullscreen (Distraction Free Writing) TinyMCE plugin
+ * WP Fullscreen (Distraction-Free Writing) TinyMCE plugin
  */
 tinymce.PluginManager.add( 'wpfullscreen', function( editor ) {
 	var settings = editor.settings;
@@ -60,14 +60,14 @@ tinymce.PluginManager.add( 'wpfullscreen', function( editor ) {
 
 	// Register buttons
 	editor.addButton( 'wp_fullscreen', {
-		tooltip: 'Distraction Free Writing',
+		tooltip: 'Distraction-free writing mode',
 		shortcut: 'Alt+Shift+W',
 		onclick: toggleFullscreen,
 		classes: 'wp-fullscreen btn widget' // This overwrites all classes on the container!
 	});
 
 	editor.addMenuItem( 'wp_fullscreen', {
-		text: 'Distraction Free Writing',
+		text: 'Distraction-free writing mode',
 		icon: 'wp_fullscreen',
 		shortcut: 'Alt+Shift+W',
 		context: 'view',

wp-includes/js/tinymce/plugins/wpfullscreen/plugin.min.js

@@ -1 +1 @@
-tinymce.PluginManager.add("wpfullscreen",function(a){function b(){f.wp_fullscreen=!0,a.dom.addClass(a.getDoc().documentElement,"wp-fullscreen"),a.execCommand("wpAutoResizeOn")}function c(){f.wp_fullscreen=!1,a.dom.removeClass(a.getDoc().documentElement,"wp-fullscreen"),a.execCommand("wpAutoResizeOff")}function d(){return"undefined"!=typeof wp&&wp.editor&&wp.editor.fullscreen}function e(){var b=d();b&&(a.getParam("wp_fullscreen")?b.off():b.on())}var f=a.settings;a.addCommand("wpFullScreenOn",b),a.addCommand("wpFullScreenOff",c),a.addCommand("wpFullScreen",e),a.on("keydown",function(a){var b;27===a.keyCode&&(b=d())&&b.settings.visible&&b.off()}),a.on("init",function(){a.getParam("wp_fullscreen")&&b()}),a.addButton("wp_fullscreen",{tooltip:"Distraction Free Writing",shortcut:"Alt+Shift+W",onclick:e,classes:"wp-fullscreen btn widget"}),a.addMenuItem("wp_fullscreen",{text:"Distraction Free Writing",icon:"wp_fullscreen",shortcut:"Alt+Shift+W",context:"view",onclick:e})});
+tinymce.PluginManager.add("wpfullscreen",function(a){function b(){f.wp_fullscreen=!0,a.dom.addClass(a.getDoc().documentElement,"wp-fullscreen"),a.execCommand("wpAutoResizeOn")}function c(){f.wp_fullscreen=!1,a.dom.removeClass(a.getDoc().documentElement,"wp-fullscreen"),a.execCommand("wpAutoResizeOff")}function d(){return"undefined"!=typeof wp&&wp.editor&&wp.editor.fullscreen}function e(){var b=d();b&&(a.getParam("wp_fullscreen")?b.off():b.on())}var f=a.settings;a.addCommand("wpFullScreenOn",b),a.addCommand("wpFullScreenOff",c),a.addCommand("wpFullScreen",e),a.on("keydown",function(a){var b;27===a.keyCode&&(b=d())&&b.settings.visible&&b.off()}),a.on("init",function(){a.getParam("wp_fullscreen")&&b()}),a.addButton("wp_fullscreen",{tooltip:"Distraction-free writing mode",shortcut:"Alt+Shift+W",onclick:e,classes:"wp-fullscreen btn widget"}),a.addMenuItem("wp_fullscreen",{text:"Distraction-free writing mode",icon:"wp_fullscreen",shortcut:"Alt+Shift+W",context:"view",onclick:e})});

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

@@ -115,7 +115,7 @@ header('Content-Type: text/html; charset=' . get_bloginfo('charset'));
 		<tr><th>u</th><td><strong>&bull;</strong> <?php _e('List'); ?></td><th>a</th><td><?php _e('Insert link'); ?></td></tr>
 		<tr><th>o</th><td>1. <?php _e('List'); ?></td><th>s</th><td><?php _e('Remove link'); ?></td></tr>
 		<tr><th>q</th><td><?php _e('Quote'); ?></td><th>m</th><td><?php _e('Insert Image'); ?></td></tr>
-		<tr><th>w</th><td><?php _e('Distraction Free Writing mode'); ?></td><th>t</th><td><?php _e('Insert More Tag'); ?></td></tr>
+		<tr><th>w</th><td><?php _e('Distraction-free writing mode'); ?></td><th>t</th><td><?php _e('Insert More Tag'); ?></td></tr>
 		<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>

wp-includes/script-loader.php

@@ -95,7 +95,7 @@ function wp_default_scripts( &$scripts ) {
 		'toggleFullscreen'      => esc_attr__( 'Toggle fullscreen mode' ),
 		'textdirection'         => esc_attr__( 'text direction' ),
 		'toggleTextdirection'   => esc_attr__( 'Toggle Editor Text Direction' ),
-		'dfw'                   => esc_attr__( 'Distraction Free Writing' )
+		'dfw'                   => esc_attr__( 'Distraction-free writing mode' )
 	) );
 
 	$scripts->add( 'colorpicker', "/wp-includes/js/colorpicker$suffix.js", array('prototype'), '3517m' );