Ticket #49797: 49797.diff

src/wp-content/themes/twentytwenty/classes/class-twentytwenty-customize.php

@@ -122 +122 @@
                                         'section' => 'colors',
                                         'label'   => __( 'Primary Color', 'twentytwenty' ),
                                         'choices' => array(
-                                                'default' => __( 'Default', 'twentytwenty' ),
-                                                'custom'  => __( 'Custom', 'twentytwenty' ),
+                                                'default' => _x( 'Default', 'color', 'twentytwenty' ),
+                                                'custom'  => _x( 'Custom', 'color', 'twentytwenty' ),
                                         ),
                                 )
                         );

src/wp-content/themes/twentytwenty/functions.php

@@ -491 +491 @@
                         'color' => twentytwenty_get_color_for_area( 'content', 'accent' ),
                 ),
                 array(
-                        'name'  => __( 'Primary', 'twentytwenty' ),
+                        'name'  => _x( 'Primary', 'color', 'twentytwenty' ),
                         'slug'  => 'primary',
                         'color' => twentytwenty_get_color_for_area( 'content', 'text' ),
                 ),
                 array(
-                        'name'  => __( 'Secondary', 'twentytwenty' ),
+                        'name'  => _x( 'Secondary', 'color', 'twentytwenty' ),
                         'slug'  => 'secondary',
                         'color' => twentytwenty_get_color_for_area( 'content', 'secondary' ),
                 ),

src/wp-content/themes/twentytwenty/header.php

@@ -50 +50 @@
                                                                 <span class="toggle-icon">
                                                                         <?php twentytwenty_the_theme_svg( 'search' ); ?>
                                                                 </span>
-                                                                <span class="toggle-text"><?php _e( 'Search', 'twentytwenty' ); ?></span>
+                                                                <span class="toggle-text"><?php _ex( 'Search', 'toggle text', 'twentytwenty' ); ?></span>
                                                         </span>
                                                 </button><!-- .search-toggle -->
 
@@ -85 +85 @@
                                         if ( has_nav_menu( 'primary' ) || ! has_nav_menu( 'expanded' ) ) {
                                                 ?>
 
-                                                        <nav class="primary-menu-wrapper" aria-label="<?php esc_attr_e( 'Horizontal', 'twentytwenty' ); ?>" role="navigation">
+                                                        <nav class="primary-menu-wrapper" aria-label="<?php echo esc_attr_x( 'Horizontal', 'menu', 'twentytwenty' ); ?>" role="navigation">
 
                                                                 <ul class="primary-menu reset-list-style">
 
@@ -154 +154 @@
                                                                 <button class="toggle search-toggle desktop-search-toggle" data-toggle-target=".search-modal" data-toggle-body-class="showing-search-modal" data-set-focus=".search-modal .search-field" aria-expanded="false">
                                                                         <span class="toggle-inner">
                                                                                 <?php twentytwenty_the_theme_svg( 'search' ); ?>
-                                                                                <span class="toggle-text"><?php _e( 'Search', 'twentytwenty' ); ?></span>
+                                                                                <span class="toggle-text"><?php _ex( 'Search', 'toggle text', 'twentytwenty' ); ?></span>
                                                                         </span>
                                                                 </button><!-- .search-toggle -->
 

src/wp-content/themes/twentytwenty/template-parts/modal-menu.php

@@ -45 +45 @@
 
                                         ?>
 
-                                        <nav class="expanded-menu<?php echo esc_attr( $expanded_nav_classes ); ?>" aria-label="<?php esc_attr_e( 'Expanded', 'twentytwenty' ); ?>" role="navigation">
+                                        <nav class="expanded-menu<?php echo esc_attr( $expanded_nav_classes ); ?>" aria-label="<?php echo esc_attr_x( 'Expanded', 'menu', 'twentytwenty' ); ?>" role="navigation">
 
                                                 <ul class="modal-menu reset-list-style">
                                                         <?php
@@ -70 +70 @@
                                 if ( 'expanded' !== $mobile_menu_location ) {
                                         ?>
 
-                                        <nav class="mobile-menu" aria-label="<?php esc_attr_e( 'Mobile', 'twentytwenty' ); ?>" role="navigation">
+                                        <nav class="mobile-menu" aria-label="<?php echo esc_attr_x( 'Mobile', 'menu', 'twentytwenty' ); ?>" role="navigation">
 
                                                 <ul class="modal-menu reset-list-style">