Changeset 35722

Timestamp:

11/20/2015 05:45:57 PM (11 years ago)

Author:

SergeyBiryukov

Message:

Customizer: Use correct context and translator comments for menu location strings.

See #33431.

Location:

trunk/src

Files:

• wp-admin/nav-menus.php (modified) (1 diff)
• wp-includes/class-wp-customize-nav-menus.php (modified) (1 diff)
• wp-includes/customize/class-wp-customize-nav-menu-control.php (modified) (1 diff)

trunk/src/wp-admin/nav-menus.php

@@ -799 +799 @@
                                                                                 <?php foreach ( $locations as $location => $description ) : ?>
                                                                                 <dd class="checkbox-input">
-                                                                                        <input type="checkbox"<?php checked( isset( $menu_locations[ $location ] ) && $menu_locations[ $location ] == $nav_menu_selected_id ); ?> name="menu-locations[<?php echo esc_attr( $location ); ?>]" id="locations-<?php echo esc_attr( $location ); ?>" value="<?php echo esc_attr( $nav_menu_selected_id ); ?>" /> <label for="locations-<?php echo esc_attr( $location ); ?>"><?php echo $description; ?></label>
+                                                                                        <input type="checkbox"<?php checked( isset( $menu_locations[ $location ] ) && $menu_locations[ $location ] == $nav_menu_selected_id ); ?> name="menu-locations[<?php echo esc_attr( $location ); ?>]" id="locations-<?php echo esc_attr( $location ); ?>" value="<?php echo esc_attr( $nav_menu_selected_id ); ?>" />
+                                                                                        <label for="locations-<?php echo esc_attr( $location ); ?>"><?php echo $description; ?></label>
                                                                                         <?php if ( ! empty( $menu_locations[ $location ] ) && $menu_locations[ $location ] != $nav_menu_selected_id ) : ?>
-                                                                                        <span class="theme-location-set"> <?php printf( __( "(Currently set to: %s)" ), wp_get_nav_menu_object( $menu_locations[ $location ] )->name ); ?> </span>
+                                                                                                <span class="theme-location-set"><?php 
+                                                                                                        /* translators: %s: menu name */
+                                                                                                        printf( _x( '(Currently set to: %s)', 'menu location' ),
+                                                                                                                wp_get_nav_menu_object( $menu_locations[ $location ] )->name
+                                                                                                        );
+                                                                                                ?></span>
                                                                                         <?php endif; ?>
                                                                                 </dd>

trunk/src/wp-includes/class-wp-customize-nav-menus.php

@@ -337 +337 @@
                                 'unnamed'           => _x( '(unnamed)', 'Missing menu name.' ),
                                 'custom_label'      => __( 'Custom Link' ),
-                                /* translators: %s: Current menu location */
-                                'menuLocation'      => _x( '(Currently set to: %s)', 'Current menu location' ),
+                                /* translators: %s: menu location slug */
+                                'menuLocation'      => _x( '(Currently set to: %s)', 'menu' ),
                                 'menuNameLabel'     => __( 'Menu Name' ),
                                 'itemAdded'         => __( 'Menu item added' ),

trunk/src/wp-includes/customize/class-wp-customize-nav-menu-control.php

@@ -72 +72 @@
                                 <label>
                                         <input type="checkbox" data-menu-id="{{ data.menu_id }}" data-location-id="<?php echo esc_attr( $location ); ?>" class="menu-location" /> <?php echo $description; ?>
-                                        <span class="theme-location-set"><?php printf( /* translators: %s: menu name */ _x( '(Current: %s)', 'Current menu location' ), '<span class="current-menu-location-name-' . esc_attr( $location ) . '"></span>' ); ?></span>
+                                        <span class="theme-location-set"><?php
+                                                /* translators: %s: menu name */
+                                                printf( _x( '(Current: %s)', 'menu location' ),
+                                                        '<span class="current-menu-location-name-' . esc_attr( $location ) . '"></span>'
+                                                );
+                                        ?></span>
                                 </label>
                         </li>