Make WordPress Core

Changeset 30892


Ignore:
Timestamp:
12/16/2014 12:14:27 PM (9 years ago)
Author:
johnbillion
Message:

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

Merges [30890] to the 4.1 branch.

Fixes #30657.

Location:
branches/4.1
Files:
12 edited

Legend:

Unmodified
Added
Removed
  • branches/4.1

  • branches/4.1/src/wp-admin/css/l10n.css

    r29539 r30892  
    4545.locale-zh-cn form.upgrade .hint { font-style: normal; font-size: 100%; }
    4646
    47 /* Zn_CH: Distraction free writing.
     47/* Zn_CH: Distraction-free writing.
    4848 *  More beautiful font for "Just write."
    4949 *  Larger text for HTML/Visual mode.
  • branches/4.1/src/wp-admin/edit-form-advanced.php

    r30754 r30892  
    286286    $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>';
    287287    $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>';
    288     $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>';
     288    $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>';
    289289    $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>';
    290290
  • branches/4.1/src/wp-admin/includes/template.php

    r30850 r30892  
    20562056        }
    20572057
    2058         $content  = '<h3>' . __( 'Distraction Free Writing' ) . '</h3>';
     2058        $content  = '<h3>' . __( 'Distraction-Free Writing' ) . '</h3>';
    20592059        $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>';
    20602060
  • branches/4.1/src/wp-admin/js/editor-expand.js

    r30818 r30892  
    11301130                    } );
    11311131                },
    1132                 tooltip: 'Distraction Free Writing',
     1132                tooltip: 'Distraction-free writing mode',
    11331133                shortcut: 'Alt+Shift+W'
    11341134            } );
  • branches/4.1/src/wp-admin/js/wp-fullscreen.js

    r29533 r30892  
    11/* global deleteUserSetting, setUserSetting, switchEditors, tinymce, tinyMCEPreInit */
    22/**
    3  * Distraction Free Writing
     3 * Distraction-Free Writing
    44 * (wp-fullscreen)
    55 *
  • branches/4.1/src/wp-includes/class-wp-editor.php

    r30862 r30892  
    996996            'Insert Read More tag' => __( 'Insert Read More tag' ),
    997997            'Read more...' => __( 'Read more...' ), // Title on the placeholder inside the editor
    998             'Distraction Free Writing' => __( 'Distraction Free Writing' ),
     998            'Distraction-free writing mode' => __( 'Distraction-free writing mode' ),
    999999            'No alignment' => __( 'No alignment' ), // Tooltip for the 'alignnone' button in the image toolbar
    10001000            'Remove' => __( 'Remove' ), // Tooltip for the 'remove' button in the image toolbar
     
    12861286        /**
    12871287         * Filter the list of TinyMCE buttons for the fullscreen
    1288          * 'Distraction Free Writing' editor.
     1288         * 'Distraction-Free Writing' editor.
    12891289         *
    12901290         * @since 3.2.0
  • branches/4.1/src/wp-includes/css/editor.css

    r30815 r30892  
    16821682}
    16831683*/
    1684 /* Distraction Free Writing mode
     1684/* Distraction-Free Writing mode
    16851685 * =Overlay Styles
    16861686-------------------------------------------------------------- */
  • branches/4.1/src/wp-includes/js/tinymce/langs/wp-langs-en.js

    r27789 r30892  
    479479        editgallery: "Edit Gallery",
    480480        delgallery: "Delete Gallery",
    481         wp_fullscreen_desc: "Distraction Free Writing mode (Alt + Shift + W)"
     481        wp_fullscreen_desc: "Distraction-free writing mode (Alt + Shift + W)"
    482482    });
    483483
  • branches/4.1/src/wp-includes/js/tinymce/plugins/wpfullscreen/plugin.js

    r30593 r30892  
    11/* global tinymce */
    22/**
    3  * WP Fullscreen (Distraction Free Writing) TinyMCE plugin
     3 * WP Fullscreen (Distraction-Free Writing) TinyMCE plugin
    44 */
    55tinymce.PluginManager.add( 'wpfullscreen', function( editor ) {
     
    6161    // Register buttons
    6262    editor.addButton( 'wp_fullscreen', {
    63         tooltip: 'Distraction Free Writing',
     63        tooltip: 'Distraction-free writing mode',
    6464        shortcut: 'Alt+Shift+W',
    6565        onclick: toggleFullscreen,
     
    6868
    6969    editor.addMenuItem( 'wp_fullscreen', {
    70         text: 'Distraction Free Writing',
     70        text: 'Distraction-free writing mode',
    7171        icon: 'wp_fullscreen',
    7272        shortcut: 'Alt+Shift+W',
  • branches/4.1/src/wp-includes/js/tinymce/wp-mce-help.php

    r30757 r30892  
    116116        <tr><th>o</th><td>1. <?php _e('List'); ?></td><th>s</th><td><?php _e('Remove link'); ?></td></tr>
    117117        <tr><th>q</th><td><?php _e('Quote'); ?></td><th>m</th><td><?php _e('Insert Image'); ?></td></tr>
    118         <tr><th>w</th><td><?php _e('Distraction Free Writing mode'); ?></td><th>t</th><td><?php _e('Insert More Tag'); ?></td></tr>
     118        <tr><th>w</th><td><?php _e('Distraction-free writing mode'); ?></td><th>t</th><td><?php _e('Insert More Tag'); ?></td></tr>
    119119        <tr><th>p</th><td><?php _e('Insert Page Break tag'); ?></td><th>h</th><td><?php _e('Help'); ?></td></tr>
    120120        <tr><th>x</th><td><?php _e('Add/remove code tag'); ?></td><th> </th><td>&nbsp;</td></tr>
  • branches/4.1/src/wp-includes/script-loader.php

    r30650 r30892  
    9696        'textdirection'         => esc_attr__( 'text direction' ),
    9797        'toggleTextdirection'   => esc_attr__( 'Toggle Editor Text Direction' ),
    98         'dfw'                   => esc_attr__( 'Distraction Free Writing' )
     98        'dfw'                   => esc_attr__( 'Distraction-free writing mode' )
    9999    ) );
    100100
Note: See TracChangeset for help on using the changeset viewer.