Ticket #33743: 33743.patch
File 33743.patch, 4.5 KB (added by , 20 months ago) |
---|
-
src/wp-admin/nav-menus.php
486 486 $page_count = wp_count_posts( 'page' ); 487 487 488 488 /* 489 * If we have one themelocation, and zero menus, we take them right489 * If we have one registered menu location, and zero menus, we take them right 490 490 * into editing their first menu. 491 491 */ 492 492 if ( 1 === count( get_registered_nav_menus() ) && ! $add_new_screen … … 529 529 wp_localize_script( 'nav-menu', 'menus', $nav_menus_l10n ); 530 530 531 531 /* 532 * Redirect to add screen if there are no menus and this user s has either zero,533 * or more than 1 theme locations.532 * Redirect to add screen if there are no menus and this user has either zero 533 * or more than one registered menu location. 534 534 */ 535 535 if ( 0 === $menu_count && ! $add_new_screen && ! $one_theme_location_no_menus ) { 536 536 wp_redirect( admin_url( 'nav-menus.php?action=edit&menu=0' ) ); … … 645 645 $menu_management = '<p>' . __( 'The menu management box at the top of the screen is used to control which menu is opened in the editor below.' ) . '</p>'; 646 646 $menu_management .= '<ul><li>' . __( 'To edit an existing menu, <strong>choose a menu from the dropdown and click Select</strong>' ) . '</li>'; 647 647 $menu_management .= '<li>' . __( 'If you have not yet created any menus, <strong>click the ’create a new menu’ link</strong> to get started' ) . '</li></ul>'; 648 $menu_management .= '<p>' . __( 'You can assign theme locations to individual menus by <strong>selecting the desired settings</strong> at the bottom of the menu editor. To assign menus to all themelocations at once, <strong>visit the Manage Locations tab</strong> at the top of the screen.' ) . '</p>';648 $menu_management .= '<p>' . __( 'You can assign individual menus to the theme’s menu locations by <strong>selecting the desired settings</strong> at the bottom of the menu editor. To assign menus to all theme menu locations at once, <strong>visit the Manage Locations tab</strong> at the top of the screen.' ) . '</p>'; 649 649 650 650 get_current_screen()->add_help_tab( 651 651 array( … … 671 671 ); 672 672 else : // Locations tab. 673 673 $locations_overview = '<p>' . __( 'This screen is used for globally assigning menus to locations defined by your theme.' ) . '</p>'; 674 $locations_overview .= '<ul><li>' . __( 'To assign menus to one or more theme locations, <strong>select a menu from each location’s dropdown</strong>. When you are finished, <strong>click Save Changes</strong>' ) . '</li>';675 $locations_overview .= '<li>' . __( 'To edit a menu currently assigned to a theme location, <strong>click the adjacent ’Edit’ link</strong>' ) . '</li>';676 $locations_overview .= '<li>' . __( 'To add a new menu instead of assigning an existing one, <strong>click the ’Use new menu’ link</strong>. Your new menu will be automatically assigned to that theme location' ) . '</li></ul>';674 $locations_overview .= '<ul><li>' . __( 'To assign menus to one or more theme menu locations, <strong>select a menu from each location’s dropdown</strong>. When you are finished, <strong>click Save Changes</strong>' ) . '</li>'; 675 $locations_overview .= '<li>' . __( 'To edit a menu currently assigned to a theme menu location, <strong>click the adjacent ’Edit’ link</strong>' ) . '</li>'; 676 $locations_overview .= '<li>' . __( 'To add a new menu instead of assigning an existing one, <strong>click the ’Use new menu’ link</strong>. Your new menu will be automatically assigned to that location in the theme.' ) . '</li></ul>'; 677 677 678 678 get_current_screen()->add_help_tab( 679 679 array( … … 767 767 <table class="widefat fixed" id="menu-locations-table"> 768 768 <thead> 769 769 <tr> 770 <th scope="col" class="manage-column column-locations"><?php _e( ' ThemeLocation' ); ?></th>770 <th scope="col" class="manage-column column-locations"><?php _e( 'Menu Location' ); ?></th> 771 771 <th scope="col" class="manage-column column-menus"><?php _e( 'Assigned Menu' ); ?></th> 772 772 </tr> 773 773 </thead> … … 1113 1113 <?php if ( current_theme_supports( 'menus' ) ) : ?> 1114 1114 1115 1115 <fieldset class="menu-settings-group menu-theme-locations"> 1116 <legend class="menu-settings-group-name howto"><?php _e( ' Displaylocation' ); ?></legend>1116 <legend class="menu-settings-group-name howto"><?php _e( 'Menu location' ); ?></legend> 1117 1117 <?php 1118 1118 foreach ( $locations as $location => $description ) : 1119 1119 $checked = false;